X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=8d77a0f0b87acd68417d09a1761b37d1f5b3452d;hb=a3abf3b3ef581c415e4a29845453e49258faaada;hp=b1f28137d1a0878d748282ef1becae69d5495407;hpb=2e945e48fb0af513654a3a5dab429c0f1eb13c66;p=sic.git

diff --git a/sic.c b/sic.c
index b1f2813..8d77a0f 100644
--- a/sic.c
+++ b/sic.c
@@ -16,9 +16,7 @@
 #define PINGTIMEOUT 300
 #define MAXMSG 4096
 
-enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
-
-static char *server = "irc.oftc.net";
+static char *host = "irc.oftc.net";
 static unsigned short port = 6667;
 static char *nick = NULL;
 static char *fullname = NULL;
@@ -55,6 +53,8 @@ pout(char *channel, char *msg) {
 
 static void
 privmsg(char *channel, char *msg) {
+	if(channel[0] == 0)
+		return;
 	snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg);
 	pout(channel, bufout);
 	snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg);
@@ -74,7 +74,7 @@ parsein(char *msg) {
 	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 - 300 LOC are too much!\r\n", &msg[3]);
+		snprintf(bufout, sizeof bufout, "PART %s :sic - 250 LOC are too much!\r\n", &msg[3]);
 	else if(!strncmp(msg + 1, "m ", 2)) {
 		if((p = strchr(&msg[3], ' ')))
 			*(p++) = 0;
@@ -95,130 +95,52 @@ parsein(char *msg) {
 	write(srv, bufout, strlen(bufout));
 }
 
-static unsigned int
-tokenize(char **result, unsigned int reslen, char *str, char delim) {
-	char *p, *n;
-	unsigned int i = 0;
-
-	if(!str)
-		return 0;
-	for(n = str; *n == delim; n++);
-	p = n;
-	for(i = 0; *n != 0;) {
-		if(i == reslen)
-			return i;
-		if(*n == delim) {
-			*n = 0;
-			if(strlen(p))
-				result[i++] = p;
-			p = ++n;
-		} else
-			n++;
-	}
-	if((i < reslen) && (p < n) && strlen(p))
-		result[i++] = p;
-	return i;	/* number of tokens */
-}
-
 static void
 parsesrv(char *msg) {
-	char *argv[Tlast], *cmd, *p;
-	int i;
+	char *chan, *cmd, *p, *txt, *usr; 
 
 	if(!msg || !(*msg))
 		return;
-	for(i = 0; i < Tlast; i++)
-		argv[i] = NULL;
-	/* <bufout>  ::= [':' <prefix> <SPACE> ] <command> <params> <crlf>
-	 * <prefix>   ::= <servername> | <nick> [ '!' <user> ] [ '@' <server> ]
-	 * <command>  ::= <letter> { <letter> } | <number> <number> <number>
-	 * <SPACE>    ::= ' ' { ' ' }
-	 * <params>   ::= <SPACE> [ ':' <trailing> | <middle> <params> ]
-	 * <middle>   ::= <Any *non-empty* sequence of octets not including SPACE
-	 * or NUL or CR or LF, the first of which may not be ':'>
-	 * <trailing> ::= <Any, possibly *empty*, sequence of octets not including NUL or CR or LF>
-	 * <crlf>     ::= CR LF
-	 */
+	pout("debug", msg);
 	if(msg[0] == ':') { /* check prefix */
-		if (!(p = strchr(msg, ' ')))
+		if(!(p = strchr(msg, ' ')))
 			return;
 		*p = 0;
-		for(++p; *p == ' '; p++);
-		cmd = p;
-		argv[Tnick] = &msg[1];
-		if((p = strchr(msg, '!'))) {
+		usr = &msg[1];
+		cmd = ++p;
+		if((p = strchr(usr, '!')))
 			*p = 0;
-			argv[Tuser] = ++p;
-		}
 	} else
 		cmd = msg;
 	/* remove CRLFs */
-	for(p = cmd; p && *p != 0; p++)
+	for(p = cmd; *p; p++)
 		if(*p == '\r' || *p == '\n')
 			*p = 0;
-	if((p = strchr(cmd, ':'))) {
-		*p = 0;
-		argv[Ttext] = ++p;
-	}
-	tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
-	if(!argv[Tcmd] || !strncmp("PONG", argv[Tcmd], 5))
-		return;
-	else if(!strncmp("PING", argv[Tcmd], 5)) {
-		snprintf(bufout, sizeof bufout, "PONG %s\r\n", argv[Ttext]);
-		write(srv, bufout, strlen(bufout));
+	if(!strncmp("PONG", cmd, 4))
 		return;
-	}
-	else if(!argv[Tnick] || !argv[Tuser]) {	/* server command */
-		snprintf(bufout, sizeof bufout, "%s", argv[Ttext] ? argv[Ttext] : "");
-		pout(server, bufout);
-		return;
-	}
-	else if(!strncmp("ERROR", argv[Tcmd], 6))
-		snprintf(bufout, sizeof bufout, "-!- error %s",
-				argv[Ttext] ? argv[Ttext] : "unknown");
-	else if(!strncmp("JOIN", argv[Tcmd], 5)) {
-		if(argv[Ttext]!=NULL){
-			p = strchr(argv[Ttext], ' ');
-		if(p)
-			*p = 0;
+	if(!strncmp("PRIVMSG", cmd, 7) || !strncmp("PING", cmd, 4)) {
+		if(!(p = strchr(cmd, ' ')))
+			return;
+		*p = 0;
+		chan = ++p;
+		for(; *p && *p != ' '; p++);
+		*p = 0;
+		if(!(p = strchr(++p, ':')))
+			return;
+		*p = 0;
+		txt = ++p;
+		if(!strncmp("PRIVMSG", cmd, 8) && chan && txt) {
+			snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt);
+			pout(chan, bufout);
 		}
-		argv[Tchan] = argv[Ttext];
-		snprintf(bufout, sizeof bufout, "-!- %s(%s) has joined %s",
-				argv[Tnick], argv[Tuser], argv[Ttext]);
-	}
-	else if(!strncmp("PART", argv[Tcmd], 5)) {
-		snprintf(bufout, sizeof bufout, "-!- %s(%s) has left %s",
-				argv[Tnick], argv[Tuser], argv[Tchan]);
+		else if(!strncmp("PING", cmd, 5) && txt) {
+			snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt);
+			write(srv, bufout, strlen(bufout));
+		}
+		return;
 	}
-	else if(!strncmp("MODE", argv[Tcmd], 5))
-		snprintf(bufout, sizeof bufout, "-!- %s changed mode/%s -> %s %s",
-				argv[Tnick], argv[Tcmd + 1] ? argv[Tcmd + 1] : "",
-				argv[Tcmd + 2] ? argv[Tcmd + 2] : "",
-				argv[Tcmd + 3] ? argv[Tcmd + 3] : "");
-	else if(!strncmp("QUIT", argv[Tcmd], 5))
-		snprintf(bufout, sizeof bufout, "-!- %s(%s) has quit \"%s\"",
-				argv[Tnick], argv[Tuser],
-				argv[Ttext] ? argv[Ttext] : "");
-	else if(!strncmp("NICK", argv[Tcmd], 5))
-		snprintf(bufout, sizeof bufout, "-!- %s changed nick to %s",
-				argv[Tnick], argv[Ttext]);
-	else if(!strncmp("TOPIC", argv[Tcmd], 6))
-		snprintf(bufout, sizeof bufout, "-!- %s changed topic to \"%s\"",
-				argv[Tnick], argv[Ttext] ? argv[Ttext] : "");
-	else if(!strncmp("KICK", argv[Tcmd], 5))
-		snprintf(bufout, sizeof bufout, "-!- %s kicked %s (\"%s\")",
-				argv[Tnick], argv[Targ],
-				argv[Ttext] ? argv[Ttext] : "");
-	else if(!strncmp("NOTICE", argv[Tcmd], 7))
-		snprintf(bufout, sizeof bufout, "-!- \"%s\")",
-				argv[Ttext] ? argv[Ttext] : "");
-	else if(!strncmp("PRIVMSG", argv[Tcmd], 8))
-		snprintf(bufout, sizeof bufout, "<%s> %s",
-				argv[Tnick], argv[Ttext] ? argv[Ttext] : "");
-	if(!argv[Tchan] || !strncmp(argv[Tchan], nick, strlen(nick)))
-		pout(argv[Tnick], bufout);
-	else
-		pout(argv[Tchan], bufout);
+	snprintf(bufout, sizeof bufout, "-!- %s", cmd);
+	pout(host, bufout);
 }
 
 int
@@ -232,8 +154,8 @@ main(int argc, char *argv[]) {
 
 	nick = fullname = getenv("USER");
 	for(i = 1; i < argc; i++)
-		if(!strncmp(argv[i], "-s", 3)) {
-			if(++i < argc) server = argv[i];
+		if(!strncmp(argv[i], "-h", 3)) {
+			if(++i < argc) host = argv[i];
 		}
 		else if(!strncmp(argv[i], "-p", 3)) {
 			if(++i < argc) port = (unsigned short)atoi(argv[i]);
@@ -252,18 +174,18 @@ main(int argc, char *argv[]) {
 			exit(EXIT_SUCCESS);
 		}
 		else {
-			fputs("usage: sic [-s server] [-p port] [-n nick]"
+			fputs("usage: sic [-h host] [-p port] [-n nick]"
 					" [-k keyword] [-f fullname] [-v]\n", stderr);
 			exit(EXIT_FAILURE);
 		}
 
 	/* init */
 	if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-		fprintf(stderr, "sic: cannot connect server '%s'\n", server);
+		fprintf(stderr, "sic: cannot connect host '%s'\n", host);
 		exit(EXIT_FAILURE);
 	}
-	if (NULL == (hp = gethostbyname(server))) {
-		fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server);
+	if (NULL == (hp = gethostbyname(host))) {
+		fprintf(stderr, "sic: cannot resolve hostname '%s'\n", host);
 		exit(EXIT_FAILURE);
 	}
 	addr.sin_family = AF_INET;
@@ -271,19 +193,19 @@ main(int argc, char *argv[]) {
 	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);
+		fprintf(stderr, "sic: cannot connect host '%s'\n", host);
 		exit(EXIT_FAILURE);
 	}
 	/* login */
 	if(password)
 		snprintf(bufout, sizeof bufout,
 				"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
-				password, nick, nick, server, fullname);
+				password, nick, nick, host, fullname);
 	else
 		snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-				 nick, nick, server, fullname);
+				 nick, nick, host, fullname);
 	write(srv, bufout, strlen(bufout));
-	snprintf(ping, sizeof ping, "PING %s\r\n", server);
+	snprintf(ping, sizeof ping, "PING %s\r\n", host);
 	channel[0] = 0;
 	setbuf(stdout, NULL); /* unbuffered stdout */
 
@@ -301,7 +223,7 @@ main(int argc, char *argv[]) {
 			exit(EXIT_FAILURE);
 		} else if(i == 0) {
 			if(time(NULL) - trespond >= PINGTIMEOUT) {
-				pout(server, "-!- sic shutting down: parse timeout");
+				pout(host, "-!- sic shutting down: parse timeout");
 				exit(EXIT_FAILURE);
 			}
 			write(srv, ping, strlen(ping));
@@ -309,7 +231,7 @@ main(int argc, char *argv[]) {
 		}
 		if(FD_ISSET(srv, &rd)) {
 			if(getline(srv, sizeof bufin, bufin) == -1) {
-				perror("sic: remote server closed connection");
+				perror("sic: remote host closed connection");
 				exit(EXIT_FAILURE);
 			}
 			parsesrv(bufin);