made Makefile consistent

.hgtags

@@ -2,3 +2,8 @@ de32c537aaf66554894712563ffba8d9bc4c2714 0.1
 56350a01f27753cfbdbb3dbc25f2a53dd4c2ac45 0.2
 d77f00af559258679a0fad5d264685d663e6975a 0.3
 a3549fb4c72ff0edb816c8c29be7ff289db5b003 0.4
+70d49a37b35695f2f771bddaf309f05ea60af8bc 0.5
+d7923d9e717c1c6f1ed3b17ec90bfdd7e7bfcca0 0.6
+643a6e8b8634b70d2459637fcfff6eca776fc919 0.7
+07fb3efaa2e9ed18c6c16f0ddd8576cb66fec9c6 0.8
+96eb1bfede5b72fcee3f515d3113d814f7e87108 0.9

LICENSE

@@ -1,7 +1,7 @@
 MIT/X Consortium License
 
-(C)opyright MMV-MMVI Anselm R. Garbe <garbeam@gmail.com>
-(C)opyright MMV Nico Golde <nico at ngolde dot de>
+© 2005-2008 Anselm R Garbe <garbeam at gmail dot com>
+© 2005 Nico Golde <nico at ngolde dot de>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Makefile

@@ -1,5 +1,4 @@
 # sic - simple irc client
-#   (C)opyright MMVI Anselm R. Garbe
 
 include config.mk
 
@@ -13,7 +12,6 @@ options:
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
-	@echo "LD       = ${LD}"
 
 .c.o:
 	@echo CC $<
@@ -22,9 +20,8 @@ options:
 ${OBJ}: config.mk
 
 sic: ${OBJ}
-	@echo LD $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
+	@echo CC -o $@
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
 	@echo cleaning
@@ -45,7 +42,7 @@ install: all
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/sic
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@sed 's/VERSION/${VERSION}/g' < sic.1 > ${DESTDIR}${MANPREFIX}/man1/sic.1
+	@sed "s/VERSION/${VERSION}/g" < sic.1 > ${DESTDIR}${MANPREFIX}/man1/sic.1
 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/sic.1
 
 uninstall:

config.mk

@@ -1,5 +1,5 @@
 # sic version
-VERSION = 0.5
+VERSION = 1.0
 
 # Customize below to fit your system
 
@@ -12,11 +12,9 @@ INCS = -I. -I/usr/include
 LIBS = -L/usr/lib -lc
 
 # flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = -g ${LIBS}
+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
 
 # compiler and linker
 CC = cc
-LD = ${CC}

sic.1

@@ -3,11 +3,10 @@
 sic \- simple irc client
 .SH SYNOPSIS
 .B sic
-.RB [ \-s " <server>"]
+.RB [ \-h " <host>"]
 .RB [ \-p " <port>"]
 .RB [ \-n " <nick>"]
 .RB [ \-k " <keyword>"]
-.RB [ \-f " <fullname>"]
 .RB [ \-v ]
 .SH DESCRIPTION
 .B sic
@@ -17,8 +16,8 @@ also all channel traffic into one output, that you don't have to switch
 different channel buffers, that's actually a feature.
 .SH OPTIONS
 .TP
-.B \-s <server>
-Overrides the default server (irc.oftc.net)
+.B \-h <host>
+Overrides the default host (irc.oftc.net)
 .TP
 .B \-p <port>
 Overrides the default port (6667)
@@ -27,29 +26,22 @@ Overrides the default port (6667)
 Override the default nick ($USER)
 .TP
 .B \-k <keyword>
-Specifies the keyword to authenticate your nick on the server
-.TP
-.B \-f <fullname>
-Specify the real name (default is $USER)
+Specifies the keyword to authenticate your nick on the host
 .TP
 .BI \-v
 Prints version information to standard output, then exits.
 .SH COMMANDS
 .TP
-.B /j #channel
+.B :j #channel
 Join a channel
 .TP
-.B /l #channel
+.B :l #channel
 Leave a channel
 .TP
-.B /m #channel/user msg
+.B :m #channel/user msg
 Write a message to #channel/user
 .TP
-.B /s #channel/user
+.B :s #channel/user
 Set default channel/user
 .TP
-.B /t topic
-Set the channel topic
-.TP
-Everything which is not a command will simply be posted into the channel or to
-the server.
+Everything which is not a command is simply send the server.

sic.c

@@ -1,10 +1,10 @@
-/* (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.
- */
+/* © 2005-2008 Anselm R Garbe <garbeam at gmail dot com>
+ * © 2005 Nico Golde <nico at ngolde dot de>
+ * See LICENSE file for license details. */
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,23 +14,135 @@
 #include <sys/time.h>
 
 #define PINGTIMEOUT 300
-#define MAXMSG 4096
+#define MAXMSG      4096
 
-enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
+static void die(const char *errstr, ...);
+static void printl(char *channel, char *msg);
+static void privmsg(char *channel, char *msg);
+static void parsein(char *msg);
+static void parsesrv(char *msg);
+static int readl(int fd, unsigned int len, char *buf);
 
-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;
 static char *password = NULL;
+static char nick[32];
 
 static char bufin[MAXMSG], bufout[MAXMSG];
 static char channel[256];
 static int srv;
 static time_t trespond;
 
-static int
-getline(int fd, unsigned int len, char *buf) {
+void
+die(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+void
+printl(char *channel, char *msg) {
+	static char timestr[18];
+	time_t t = time(0);
+
+	strftime(timestr, sizeof timestr, "%D %R", localtime(&t));
+	fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, msg);
+}
+
+void
+privmsg(char *channel, char *msg) {
+	if(channel[0] == 0)
+		return;
+	snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg);
+	printl(channel, bufout);
+	snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg);
+	write(srv, bufout, strlen(bufout));
+}
+
+void
+parsein(char *msg) {
+	char *p;
+
+	if(msg[0] == 0)
+		return;
+	if(msg[0] != ':') {
+		privmsg(channel, msg);
+		return;
+	}
+	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 - 250 LOC are too much!\r\n", msg + 3);
+	else if(!strncmp(msg + 1, "m ", 2)) {
+		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);
+		return;
+	}
+	else
+		snprintf(bufout, sizeof bufout, "%s\r\n", msg + 1);
+	write(srv, bufout, strlen(bufout));
+}
+
+void
+parsesrv(char *msg) {
+	char *chan, *cmd, *p, *txt, *usr; 
+
+	txt = NULL;
+	usr = host;
+	if(!msg || !(*msg))
+		return;
+	if(msg[0] != ':')
+		cmd = msg;
+	else {
+		if(!(p = strchr(msg, ' ')))
+			return;
+		*p = 0;
+		usr = msg + 1;
+		cmd = ++p;
+		if((p = strchr(usr, '!')))
+			*p = 0;
+	}
+	for(p = cmd; *p; p++) /* remove CRLFs */
+		if(*p == '\r' || *p == '\n')
+			*p = 0;
+	if((p = strchr(cmd, ':'))) {
+		*p = 0;
+		txt = ++p;
+	}
+	if(!strncmp("PONG", cmd, 4))
+		return;
+	if(!strncmp("PRIVMSG", cmd, 7) && txt) {
+		if(!(p = strchr(cmd, ' ')))
+			return;
+		*p = 0;
+		chan = ++p;
+		for(; *p && *p != ' '; p++);
+		*p = 0;
+		snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt);
+		printl(chan, bufout);
+	}
+	else if(!strncmp("PING", cmd, 4) && txt) {
+		snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt);
+		write(srv, bufout, strlen(bufout));
+	}
+	else {
+		snprintf(bufout, sizeof bufout, ">< %s: %s", cmd, txt ? txt : "");
+		printl(usr, bufout);
+		if(!strncmp("NICK", cmd, 4) && !strncmp(usr, nick, sizeof nick) && txt)
+			strncpy(nick, txt, sizeof nick);
+	}
+}
+
+int
+readl(int fd, unsigned int len, char *buf) {
 	unsigned int i = 0;
 	char c;
 
@@ -44,182 +156,6 @@ getline(int fd, unsigned int len, char *buf) {
 	return 0;
 }
 
-static void
-pout(char *channel, char *msg) {
-	static char timestr[18];
-	time_t t = time(0);
-
-	strftime(timestr, sizeof(timestr), "%a %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);
-	pout(channel, bufout);
-	snprintf(bufout, sizeof(bufout), "PRIVMSG %s :%s\r\n", channel, msg);
-	write(srv, bufout, strlen(bufout));
-}
-
-static void
-parsein(char *msg) {
-	char *p;
-
-	if(msg[0] == 0)
-		return;
-	if(msg[0] != '/') {
-		privmsg(channel, msg);
-		return;
-	}
-	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;
-	}
-	else if(!strncmp(msg + 1, "s ", 2)) {
-		strncpy(channel, &msg[3], sizeof(channel));
-		return;
-	}
-	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);
-	}
-	else
-		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) {
-	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;
-
-	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
-	 */
-	if(msg[0] == ':') { /* check prefix */
-		p = strchr(msg, ' ');
-		*p = 0;
-		for(++p; *p == ' '; p++);
-		cmd = p;
-		argv[Tnick] = &msg[1];
-		if((p = strchr(msg, '!'))) {
-			*p = 0;
-			argv[Tuser] = ++p;
-		}
-	} 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))
-		return;
-	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] : "");
-		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;
-		}
-		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("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("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);
-}
 
 int
 main(int argc, char *argv[]) {
@@ -230,60 +166,47 @@ main(int argc, char *argv[]) {
 	char ping[256];
 	fd_set rd;
 
-	nick = fullname = getenv("USER");
+	strncpy(nick, getenv("USER"), sizeof nick);
 	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]);
 		}
 		else if(!strncmp(argv[i], "-n", 3)) {
-			if(++i < argc) nick = argv[i];
+			if(++i < argc) strncpy(nick, argv[i], sizeof nick);
 		}
 		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);
-		}
+		else if(!strncmp(argv[i], "-v", 3))
+			die("sic-"VERSION", © 2005-2008 Anselm R Garbe, Nico Golde\n");
+		else
+			die("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
 
 	/* init */
-	if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-		fprintf(stderr, "sic: cannot connect server '%s'\n", server);
-		exit(EXIT_FAILURE);
-	}
-	if (NULL == (hp = gethostbyname(server))) {
-		fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server);
-		exit(EXIT_FAILURE);
-	}
+	if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+		die("error: cannot connect host '%s'\n", host);
+	if(NULL == (hp = gethostbyname(host)))
+		die("error: cannot resolve hostname '%s'\n", host);
 	addr.sin_family = AF_INET;
 	addr.sin_port = htons(port);
 	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);
-		exit(EXIT_FAILURE);
+		die("error: cannot connect host '%s'\n", host);
 	}
 	/* 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);
+		snprintf(bufout, sizeof bufout,
+		        "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
+		        password, nick, nick, host, nick);
 	else
-		snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-				 nick, nick, server, fullname);
+		snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
+		         nick, nick, host, nick);
 	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 */
 
@@ -297,29 +220,23 @@ main(int argc, char *argv[]) {
 		if(i < 0) {
 			if(errno == EINTR)
 				continue;
-			perror("sic: error on select()");
-			exit(EXIT_FAILURE);
-		} else if(i == 0) {
-			if(time(NULL) - trespond >= PINGTIMEOUT) {
-				pout(server, "-!- sic shutting down: parseing timeout");
-				exit(EXIT_FAILURE);
-			}
+			die("error: error on select()");
+		}
+		else if(i == 0) {
+			if(time(NULL) - trespond >= PINGTIMEOUT)
+				die("error: sic shutting down: parse timeout");
 			write(srv, ping, strlen(ping));
 			continue;
 		}
 		if(FD_ISSET(srv, &rd)) {
-			if(getline(srv, sizeof(bufin), bufin) == -1) {
-				perror("sic: remote server closed connection");
-				exit(EXIT_FAILURE);
-			}
+			if(readl(srv, sizeof bufin, bufin) == -1)
+				die("error: remote host closed connection");
 			parsesrv(bufin);
 			trespond = time(NULL);
 		}
 		if(FD_ISSET(0, &rd)) {
-			if(getline(0, sizeof(bufin), bufin) == -1) {
-				perror("sic: broken pipe");
-				exit(EXIT_FAILURE);
-			}
+			if(readl(0, sizeof bufin, bufin) == -1)
+				die("error: broken pipe");
 			parsein(bufin);
 		}
 	}