X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=b2fc38c2242033d51ab36217e67904a81cbb520c;hb=b8950627a7289541be837438989db4409268b41e;hp=c2dec5abd41d8af635000cbca24ebaad8a8cc001;hpb=6255ad68d67f6409ba8ee3e794f1ccdfad7ed101;p=sic.git

diff --git a/sic.c b/sic.c
index c2dec5a..b2fc38c 100644
--- a/sic.c
+++ b/sic.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
@@ -20,7 +21,7 @@
 enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
 
 static char *server = "irc.oftc.net";
-static int port = 6667;
+static unsigned short port = 6667;
 static char *nick = NULL;
 static char *fullname = NULL;
 static char *password = NULL;
@@ -75,36 +76,27 @@ parsein(char *msg)
 		privmsg(channel, msg);
 		return;
 	}
-	if((p = strchr(&msg[3], ' ')))
-		*(p++) = 0;
-	switch (msg[1]) {
-	default:
-		snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]);
-		break;
-	case 'j':
-		if(msg[3] == '#')
-			snprintf(bufout, sizeof(bufout), "JOIN %s\r\n", &msg[3]);
-		else if(p) {
-			privmsg(&msg[3], p + 1);
-			return;
-		}
-		break;
-	case 'l':
-		if(p)
-			snprintf(bufout, sizeof(bufout), "PART %s :%s\r\n", &msg[3], p);
-		else
-			snprintf(bufout, sizeof(bufout), "PART %s :sic\r\n", &msg[3]);
-		break;
-	case 'm':
+	if(!strncmp(msg + 1, "j ", 2) && (msg[3] == '#'))
+		snprintf(bufout, sizeof(bufout), "JOIN %s\r\n", &msg[3]);
+	else if(!strncmp(msg + 1, "l ", 2))
+		snprintf(bufout, sizeof(bufout), "PART %s :sic\r\n", &msg[3]);
+	else if(!strncmp(msg + 1, "m ", 2)) {
+		if(p = strchr(&msg[3], ' '))
+			*(p++) = 0;
 		privmsg(&msg[3], p);
 		return;
-	case 's':
+	}
+	else if(!strncmp(msg + 1, "s ", 2)) {
 		strncpy(channel, &msg[3], sizeof(channel));
 		return;
-	case 't':
+	}
+	else if(!strncmp(msg + 1, "t ", 2)) {
+		if(p = strchr(&msg[3], ' '))
+			*(p++) = 0;
 		snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p);
-		break;
 	}
+	else
+		snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]);
 	write(srv, bufout, strlen(bufout));
 }
 
@@ -241,7 +233,7 @@ main(int argc, char *argv[])
 	int i;
 	struct timeval tv;
 	struct hostent *hp;
-	struct sockaddr_in addr = { 0 };
+	static struct sockaddr_in addr;  /* initially filled with 0's */
 	char ping[256];
 	fd_set rd;
 
@@ -257,7 +249,7 @@ main(int argc, char *argv[])
 			server = argv[++i];
 			break;
 		case 'p':
-			port = atoi(argv[++i]);
+			port = (unsigned short)atoi(argv[++i]);
 			break;
 		case 'n':
 			nick = argv[++i];
@@ -280,10 +272,13 @@ main(int argc, char *argv[])
 		fprintf(stderr, "sic: cannot connect server '%s'\n", server);
 		exit(EXIT_FAILURE);
 	}
-	hp = gethostbyname(server);
+	if (NULL == (hp = gethostbyname(server))) {
+		fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server);
+		exit(EXIT_FAILURE);
+	}
 	addr.sin_family = AF_INET;
 	addr.sin_port = htons(port);
-	bcopy(hp->h_addr, &addr.sin_addr, hp->h_length);
+	memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
 	if(connect(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_in))) {
 		close(srv);
 		fprintf(stderr, "sic: cannot connect server '%s'\n", server);
@@ -294,10 +289,10 @@ main(int argc, char *argv[])
 	if(password)
 		snprintf(bufout, sizeof(bufout),
 				"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
-				password, nick, nick, server, fullname ? fullname : nick);
+				password, nick, nick, server, fullname);
 	else
 		snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-				 nick, nick, server, fullname ? fullname : nick);
+				 nick, nick, server, fullname);
 	write(srv, bufout, strlen(bufout));
 
 	snprintf(ping, sizeof(ping), "PING %s\r\n", server);