using Tcmd successors more carefully

.hgtags

@@ -1,2 +1,7 @@
 de32c537aaf66554894712563ffba8d9bc4c2714 0.1
 56350a01f27753cfbdbb3dbc25f2a53dd4c2ac45 0.2
+d77f00af559258679a0fad5d264685d663e6975a 0.3
+a3549fb4c72ff0edb816c8c29be7ff289db5b003 0.4
+70d49a37b35695f2f771bddaf309f05ea60af8bc 0.5
+d7923d9e717c1c6f1ed3b17ec90bfdd7e7bfcca0 0.6
+643a6e8b8634b70d2459637fcfff6eca776fc919 0.7

README

@@ -1,11 +1,11 @@
 sic - simple irc client
------------------------
-
+=======================
 sic is an extremly fast, small and simple irc client.  It reads commands from
 standard input and prints all server output to standard output. It multiplexes
 also all channel traffic into one output, that you don't have to switch
 different channel buffers, that's actually a feature.
 
+
 Installation
 ------------
 Edit config.mk to match your local setup. sic is installed into
@@ -16,11 +16,7 @@ Afterwards enter the following command to build and install sic
 
     $ make clean install
 
+
 Running sic
 -----------
 Simply invoke the 'sic' command with the required arguments.
-
-
-Configuration
--------------
-No configuration is needed.

config.mk

@@ -1,5 +1,5 @@
 # sic version
-VERSION = 0.3
+VERSION = 0.8
 
 # Customize below to fit your system
 

sic.1

@@ -3,11 +3,11 @@
 sic \- simple irc client
 .SH SYNOPSIS
 .B sic
-.RB [ \-s <server> ]
-.RB [ \-p <port> ]
-.RB [ \-n <nick> ]
-.RB [ \-k <keyword> ]
-.RB [ \-f <fullname> ]
+.RB [ \-s " <server>"]
+.RB [ \-p " <port>"]
+.RB [ \-n " <nick>"]
+.RB [ \-k " <keyword>"]
+.RB [ \-f " <fullname>"]
 .RB [ \-v ]
 .SH DESCRIPTION
 .B sic

sic.c

@@ -1,9 +1,7 @@
-/*
- * (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * (C)opyright MMV-MMVI Nico Golde <nico at ngolde dot de>
  * See LICENSE file for license details.
  */
-
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -32,10 +30,10 @@ static int srv;
 static time_t trespond;
 
 static int
-getline(int fd, unsigned int len, char *buf)
-{
+getline(int fd, unsigned int len, char *buf) {
 	unsigned int i = 0;
 	char c;
+
 	do {
 		if(read(fd, &c, sizeof(char)) != sizeof(char))
 			return -1;
@@ -47,27 +45,24 @@ getline(int fd, unsigned int len, char *buf)
 }
 
 static void
-pout(char *channel, char *msg)
-{
+pout(char *channel, char *msg) {
 	static char timestr[18];
 	time_t t = time(0);
 
-	strftime(timestr, sizeof(timestr), "%a %R", localtime(&t));
+	strftime(timestr, sizeof timestr, "%F %R", localtime(&t));
 	fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg);
 }
 
 static void
-privmsg(char *channel, char *msg)
-{
-	snprintf(bufout, sizeof(bufout), "<%s> %s", nick, msg);
+privmsg(char *channel, char *msg) {
+	snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg);
 	pout(channel, bufout);
-	snprintf(bufout, sizeof(bufout), "PRIVMSG %s :%s\r\n", channel, msg);
+	snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg);
 	write(srv, bufout, strlen(bufout));
 }
 
 static void
-parsein(char *msg)
-{
+parsein(char *msg) {
 	char *p;
 
 	if(msg[0] == 0)
@@ -77,32 +72,31 @@ parsein(char *msg)
 		return;
 	}
 	if(!strncmp(msg + 1, "j ", 2) && (msg[3] == '#'))
-		snprintf(bufout, sizeof(bufout), "JOIN %s\r\n", &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]);
+		snprintf(bufout, sizeof bufout, "PART %s :sic\r\n", &msg[3]);
 	else if(!strncmp(msg + 1, "m ", 2)) {
-		if(p = strchr(&msg[3], ' '))
+		if((p = strchr(&msg[3], ' ')))
 			*(p++) = 0;
 		privmsg(&msg[3], p);
 		return;
 	}
 	else if(!strncmp(msg + 1, "s ", 2)) {
-		strncpy(channel, &msg[3], sizeof(channel));
+		strncpy(channel, &msg[3], sizeof channel);
 		return;
 	}
 	else if(!strncmp(msg + 1, "t ", 2)) {
-		if(p = strchr(&msg[3], ' '))
+		if((p = strchr(&msg[3], ' ')))
 			*(p++) = 0;
-		snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p);
+		snprintf(bufout, sizeof bufout, "TOPIC %s :%s\r\n", &msg[3], p);
 	}
 	else
-		snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]);
+		snprintf(bufout, sizeof bufout, "%s\r\n", &msg[1]);
 	write(srv, bufout, strlen(bufout));
 }
 
 static unsigned int
-tokenize(char **result, unsigned int reslen, char *str, char delim)
-{
+tokenize(char **result, unsigned int reslen, char *str, char delim) {
 	char *p, *n;
 	unsigned int i = 0;
 
@@ -127,29 +121,29 @@ tokenize(char **result, unsigned int reslen, char *str, char delim)
 }
 
 static void
-parsesrv(char *msg)
-{
+parsesrv(char *msg) {
 	char *argv[Tlast], *cmd, *p;
 	int i;
+
 	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
+	/* <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
 	 */
 	if(msg[0] == ':') { /* check prefix */
-		p = strchr(msg, ' ');
+		if (!(p = strchr(msg, ' ')))
+			return;
 		*p = 0;
 		for(++p; *p == ' '; p++);
 		cmd = p;
@@ -160,30 +154,29 @@ parsesrv(char *msg)
 		}
 	} else
 		cmd = msg;
-
 	/* remove CRLFs */
 	for(p = cmd; p && *p != 0; p++)
 		if(*p == '\r' || *p == '\n')
 			*p = 0;
-
 	if((p = strchr(cmd, ':'))) {
 		*p = 0;
 		argv[Ttext] = ++p;
 	}
 	tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
-
-	if(!strncmp("PONG", argv[Tcmd], 5)) {
+	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]);
+	else if(!strncmp("PING", argv[Tcmd], 5)) {
+		snprintf(bufout, sizeof bufout, "PONG %s\r\n", argv[Ttext]);
 		write(srv, bufout, strlen(bufout));
 		return;
-	} else if(!argv[Tnick] || !argv[Tuser]) {	/* server command */
-		snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : "");
+	}
+	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",
+	}
+	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){
@@ -192,34 +185,37 @@ parsesrv(char *msg)
 			*p = 0;
 		}
 		argv[Tchan] = argv[Ttext];
-		snprintf(bufout, sizeof(bufout), "-!- %s(%s) has joined %s",
+		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",
+	}
+	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("MODE", argv[Tcmd], 5))
-		snprintf(bufout, sizeof(bufout), "-!- %s changed mode/%s -> %s %s",
-				argv[Tnick], argv[Tcmd + 1],
-				argv[Tcmd + 2], argv[Tcmd + 3]);
+	}
+	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\"",
+		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",
+		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\"",
+		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\")",
+		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\")",
+		snprintf(bufout, sizeof bufout, "-!- \"%s\")",
 				argv[Ttext] ? argv[Ttext] : "");
 	else if(!strncmp("PRIVMSG", argv[Tcmd], 8))
-		snprintf(bufout, sizeof(bufout), "<%s> %s",
+		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);
@@ -228,8 +224,7 @@ parsesrv(char *msg)
 }
 
 int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
 	int i;
 	struct timeval tv;
 	struct hostent *hp;
@@ -238,33 +233,30 @@ main(int argc, char *argv[])
 	fd_set rd;
 
 	nick = fullname = getenv("USER");
-	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-		switch (argv[i][1]) {
-		default:
+	for(i = 1; i < argc; i++)
+		if(!strncmp(argv[i], "-s", 3)) {
+			if(++i < argc) server = argv[i];
+		}
+		else if(!strncmp(argv[i], "-p", 3)) {
+			if(++i < argc) port = (unsigned short)atoi(argv[i]);
+		}
+		else if(!strncmp(argv[i], "-n", 3)) {
+			if(++i < argc) nick = argv[i];
+		}
+		else if(!strncmp(argv[i], "-k", 3)) {
+			if(++i < argc) password = argv[i];
+		}
+		else if(!strncmp(argv[i], "-f", 3)) {
+			if(++i < argc) fullname = argv[i];
+		}
+		else if(!strncmp(argv[i], "-v", 3)) {
+			fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+			exit(EXIT_SUCCESS);
+		}
+		else {
 			fputs("usage: sic [-s server] [-p port] [-n nick]"
 					" [-k keyword] [-f fullname] [-v]\n", stderr);
 			exit(EXIT_FAILURE);
-			break;
-		case 's':
-			server = argv[++i];
-			break;
-		case 'p':
-			port = (unsigned short)atoi(argv[++i]);
-			break;
-		case 'n':
-			nick = argv[++i];
-			break;
-		case 'k':
-			password = argv[++i];
-			break;
-		case 'f':
-			fullname = argv[++i];
-			break;
-		case 'v':
-			fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-			exit(EXIT_SUCCESS);
-			break;
-		}
 		}
 
 	/* init */
@@ -284,21 +276,20 @@ main(int argc, char *argv[])
 		fprintf(stderr, "sic: cannot connect server '%s'\n", server);
 		exit(EXIT_FAILURE);
 	}
-
 	/* login */
 	if(password)
-		snprintf(bufout, sizeof(bufout),
+		snprintf(bufout, sizeof bufout,
 				"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
 				password, nick, nick, server, fullname);
 	else
-		snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localhost %s :%s\r\n",
+		snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
 				 nick, nick, server, fullname);
 	write(srv, bufout, strlen(bufout));
-
-	snprintf(ping, sizeof(ping), "PING %s\r\n", server);
+	snprintf(ping, sizeof ping, "PING %s\r\n", server);
 	channel[0] = 0;
 	setbuf(stdout, NULL); /* unbuffered stdout */
-	for(;;) {
+
+	for(;;) { /* main loop */
 		FD_ZERO(&rd);
 		FD_SET(0, &rd);
 		FD_SET(srv, &rd);
@@ -312,14 +303,14 @@ main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 		} else if(i == 0) {
 			if(time(NULL) - trespond >= PINGTIMEOUT) {
-				pout(server, "-!- sic shutting down: parseing timeout");
+				pout(server, "-!- sic shutting down: parse timeout");
 				exit(EXIT_FAILURE);
 			}
 			write(srv, ping, strlen(ping));
 			continue;
 		}
 		if(FD_ISSET(srv, &rd)) {
-			if(getline(srv, sizeof(bufin), bufin) == -1) {
+			if(getline(srv, sizeof bufin, bufin) == -1) {
 				perror("sic: remote server closed connection");
 				exit(EXIT_FAILURE);
 			}
@@ -327,13 +318,12 @@ main(int argc, char *argv[])
 			trespond = time(NULL);
 		}
 		if(FD_ISSET(0, &rd)) {
-			if(getline(0, sizeof(bufin), bufin) == -1) {
+			if(getline(0, sizeof bufin, bufin) == -1) {
 				perror("sic: broken pipe");
 				exit(EXIT_FAILURE);
 			}
 			parsein(bufin);
 		}
 	}
-
 	return 0;
 }