cleanup

.hgtags

@@ -0,0 +1,10 @@
+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
+b8794f3ed15e34b24ff9fb11c93a4405d0f91433 1.0

LICENSE

@@ -1,7 +1,9 @@
 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-2009 Anselm R Garbe <anselm@garbe.us>
+© 2008-2009 Jeroen Schot <schot@a-eskwadraat.nl>
+© 2007-2009 Kris Maglione <maglione.k@gmail.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,19 +1,14 @@
-# ii - irc it - simple but flexible IRC client
-#   (C)opyright MMV Anselm R. Garbe, Nico Golde
+# sic - simple irc client
 
 include config.mk
 
 SRC = sic.c
 OBJ = ${SRC:.c=.o}
-MAN1 = sic.1
-BIN = sic
 
 all: options sic
-	@echo built sic
 
 options:
-	@echo ii build options:
-	@echo "LIBS     = ${LIBS}"
+	@echo sic build options:
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
@@ -22,38 +17,38 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
+${OBJ}: config.mk
+
+sic: ${OBJ}
+	@echo CC -o $@
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+
 clean:
-	rm -f sic *.o core sic-${VERSION}.tar.gz
+	@echo cleaning
+	@rm -f sic ${OBJ} sic-${VERSION}.tar.gz
 
 dist: clean
+	@echo creating dist tarball
 	@mkdir -p sic-${VERSION}
-	@cp -R Makefile README LICENSE config.mk sic.c sic.1 sic-${VERSION}
+	@cp -R LICENSE Makefile README config.mk sic.1 ${SRC} sic-${VERSION}
 	@tar -cf sic-${VERSION}.tar sic-${VERSION}
 	@gzip sic-${VERSION}.tar
 	@rm -rf sic-${VERSION}
 
-sic: ${OBJ}
-	@echo LD $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
-
 install: all
+	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
-	@for i in ${BIN}; do \
-		chmod 755 ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
-	done
-	@echo installed executable files to ${DESTDIR}${PREFIX}/bin
+	@cp -f sic ${DESTDIR}${PREFIX}/bin
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/sic
+	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
-	@for i in ${MAN1}; do \
-		chmod 444 ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
-	done
-	@echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
+	@sed "s/VERSION/${VERSION}/g" < sic.1 > ${DESTDIR}${MANPREFIX}/man1/sic.1
+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/sic.1
 
 uninstall:
-	for i in ${BIN}; do \
-		rm -f ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
-	done
-	for i in ${MAN1}; do \
-		rm -f ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
-	done
+	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+	@rm -f ${DESTDIR}${PREFIX}/bin/sic
+	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+	@rm -f ${DESTDIR}${MANPREFIX}/man1/sic.1
+
+.PHONY: all options clean dist install uninstall

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,18 +1,20 @@
-# Customize to fit your system
+# sic version
+VERSION = 1.1
+
+# Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
-VERSION = 0.1
-
 # includes and libs
-LIBS = -L${PREFIX}/lib -L/usr/lib -lc
+INCS = -I. -I/usr/include
+LIBS = -L/usr/lib -lc
 
-# compiler
-CFLAGS      = -Os -I${PREFIX}/include -I/usr/include \
-			-DVERSION=\"${VERSION}\"
-LDFLAGS     = ${LIBS}
-#CFLAGS      = -g -Wall -O2 -I${PREFIX}/include -I/usr/include \
-#			-DVERSION=\"${VERSION}\"
-#LDFLAGS     = -g ${LIBS}
+# flags
+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
+
+# compiler and linker
+CC = cc

sic.1

@@ -1,19 +1,12 @@
-.TH SIC 1 sic-0.1
+.TH SIC 1 sic-VERSION
 .SH NAME
 sic \- simple irc client
 .SH SYNOPSIS
 .B sic
-.RB [ \-s
-.IR server ]
-.RB [ \-p
-.IR port ]
-.RB [ \-n
-.IR nick ]
-.RB [ \-k
-.IR keyword ]
-.RB [ \-f
-.IR fullname ]
-.RB \-v
+.RB [ \-h " <host>"]
+.RB [ \-p " <port>"]
+.RB [ \-n " <nick>"]
+.RB [ \-k " <keyword>"]
 .RB [ \-v ]
 .SH DESCRIPTION
 .B sic
@@ -23,39 +16,32 @@ 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
-.BI \-s " server"
-Overrides the default server (irc.oftc.net)
+.B \-h <host>
+Overrides the default host (irc6.oftc.net)
 .TP
-.BI \-p " port"
+.B \-p <port>
 Overrides the default port (6667)
 .TP
-.BI \-n " nickname"
+.B \-n <nickname>
 Override the default nick ($USER)
 .TP
-.BI \-k " keyword"
-Specifies the keyword to authenticate your nick on the server
-.TP
-.BI \-f " fullname"
-Specify the real name (default is $USER)
+.B \-k <keyword>
+Specifies the keyword to authenticate your nick on the host
 .TP
 .BI \-v
 Prints version information to standard output, then exits.
 .SH COMMANDS
 .TP
-.BI /j " #channel "
+.B :j #channel
 Join a channel
 .TP
-.BI /l " #channel "
+.B :l #channel
 Leave a channel
 .TP
-.BI /m " #channel/user msg "
+.B :m #channel/user msg
 Write a message to #channel/user
 .TP
-.BI /s " #channel/user "
+.B :s #channel/user
 Set default channel/user
 .TP
-.BI /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,340 +1,207 @@
-/*
- * (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.
- */
-
+ /* See LICENSE file for license details. */
+#include <ctype.h>
 #include <errno.h>
-#include <netdb.h>
-#include <netinet/in.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <time.h>
+#include <unistd.h>
 
-#define PINGTIMEOUT 300
-#define MAXMSG 4096
-
-enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
-
-static char *server = "irc.oftc.net";
-static int port = 6667;
-static char *nick = NULL;
-static char *fullname = NULL;
-static char *password = NULL;
-
-static char bufin[MAXMSG], bufout[MAXMSG];
+static char *host = "irc.oftc.net";
+static char *port = "ircd";
+static char *password;
+static char nick[32];
+static char bufin[4096];
+static char bufout[4096];
 static char channel[256];
-static int srv;
 static time_t trespond;
+static FILE *srv;
 
-static int
-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;
-		buf[i++] = c;
-	}
-	while(c != '\n' && i < len);
-	buf[i - 1] = 0;
-	return 0;
-}
+#include "util.c"
 
 static void
-pout(char *channel, char *msg)
-{
+pout(char *channel, char *fmt, ...) {
 	static char timestr[18];
-	time_t t = time(0);
+	time_t t;
+	va_list ap;
 
-	strftime(timestr, sizeof(timestr), "%a %R", localtime(&t));
-	fprintf(stdout, "%s: %s %s\n", channel, timestr, msg);
+	va_start(ap, fmt);
+	vsnprintf(bufout, sizeof bufout, fmt, ap);
+	va_end(ap);
+	t = time(NULL);
+	strftime(timestr, sizeof timestr, "%D %R", localtime(&t));
+	fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout);
 }
 
 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));
+sout(char *fmt, ...) {
+	va_list ap;
+
+	va_start(ap, fmt);
+	vsnprintf(bufout, sizeof bufout, fmt, ap);
+	va_end(ap);
+	fprintf(srv, "%s\r\n", bufout);
 }
 
 static void
-parsein(char *msg)
-{
-	char *p;
-
-	if(msg[0] != '/') {
-		privmsg(channel, msg);
+privmsg(char *channel, char *msg) {
+	if(channel[0] == '\0') {
+		pout("", "No channel to send to");
 		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);
+	pout(channel, "<%s> %s", nick, msg);
+	sout("PRIVMSG %s :%s", channel, msg);
+}
+
+static void
+parsein(char *s) {
+	char c, *p;
+
+	if(s[0] == '\0')
+		return;
+	skip(s, '\n');
+	if(s[0] != ':') {
+		privmsg(channel, s);
+		return;
+	}
+	c = *++s;
+	if(c != '\0' && isspace(s[1])) {
+		p = s + 2;
+		switch(c) {
+		case 'j':
+			sout("JOIN %s", p);
+			if(channel[0] == '\0')
+				strlcpy(channel, p, sizeof channel);
+			return;
+		case 'l':
+			s = eat(p, isspace, 1);
+			p = eat(s, isspace, 0);
+			if(!*s)
+				s = channel;
+			if(*p)
+				*p++ = '\0';
+			if(!*p)
+				p = "sic - 250 LOC are too much!";
+			sout("PART %s :%s", s, p);
+			return;
+		case 'm':
+			s = eat(p, isspace, 1);
+			p = eat(s, isspace, 0);
+			if(*p)
+				*p++ = '\0';
+			privmsg(s, p);
+			return;
+		case 's':
+			strlcpy(channel, p, sizeof channel);
 			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':
-		privmsg(&msg[3], p);
-		return;
-	case 's':
-		strncpy(channel, &msg[3], sizeof(channel));
-		return;
-	case 't':
-		snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p);
-		break;
 	}
-	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 */
+	sout("%s", s);
 }
 
 static void
-parsesrv(char *msg)
-{
-	char *argv[Tlast], *cmd, *p;
-	int i;
-	if(!msg || !(*msg))
+parsesrv(char *cmd) {
+	char *usr, *par, *txt;
+
+	usr = host;
+	if(!cmd || !*cmd)
 		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;
+	if(cmd[0] == ':') {
+		usr = cmd + 1;
+		cmd = skip(usr, ' ');
+		if(cmd[0] == '\0')
+			return;
+		skip(usr, '!');
 	}
-	tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
-
-	if(!strncmp("PONG", argv[Tcmd], 5)) {
+	skip(cmd, '\r');
+	par = skip(cmd, ' ');
+	txt = skip(par, ':');
+	trim(par);
+	if(!strcmp("PONG", cmd))
 		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);
+	if(!strcmp("PRIVMSG", cmd))
+		pout(par, "<%s> %s", usr, txt);
+	else if(!strcmp("PING", cmd))
+		sout("PONG %s", txt);
+	else {
+		pout(usr, ">< %s (%s): %s", cmd, par, txt);
+		if(!strcmp("NICK", cmd) && !strcmp(usr, nick))
+			strlcpy(nick, txt, sizeof nick);
+	}
 }
 
 int
-main(int argc, char *argv[])
-{
-	int i;
+main(int argc, char *argv[]) {
+	int i, c;
 	struct timeval tv;
-	struct hostent *hp;
-	struct sockaddr_in addr = { 0 };
-	char ping[256];
+	const char *user = getenv("USER");
 	fd_set rd;
 
-	nick = fullname = getenv("USER");
-	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-		switch (argv[i][1]) {
-		default:
-			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];
+	strlcpy(nick, user ? user : "unknown", sizeof nick);
+	for(i = 1; i < argc; i++) {
+		c = argv[i][1];
+		if(argv[i][0] != '-' || argv[i][2])
+			c = -1;
+		switch(c) {
+		case 'h':
+			if(++i < argc) host = argv[i];
 			break;
 		case 'p':
-			port = atoi(argv[++i]);
+			if(++i < argc) port = argv[i];
 			break;
 		case 'n':
-			nick = argv[++i];
+			if(++i < argc) strlcpy(nick, argv[i], sizeof nick);
 			break;
 		case 'k':
-			password = argv[++i];
-			break;
-		case 'f':
-			fullname = argv[++i];
+			if(++i < argc) password = argv[i];
 			break;
 		case 'v':
-			fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-			exit(EXIT_SUCCESS);
-			break;
+			eprint("sic-"VERSION", © 2005-2009 Kris Maglione, Anselm R. Garbe, Nico Golde\n");
+		default:
+			eprint("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);
-	}
-	hp = gethostbyname(server);
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons(port);
-	bcopy(hp->h_addr, &addr.sin_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);
-	}
-
+	i = dial(host, port);
+	srv = fdopen(i, "r+");
 	/* login */
 	if(password)
-		snprintf(bufout, sizeof(bufout),
-				"PASS %s\r\nNICK %s\r\nUSER %s localserver %s :%s\r\n",
-				password, nick, nick, server, fullname ? fullname : nick);
-	else
-		snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localserver %s :%s\r\n",
-				 nick, nick, server, fullname ? fullname : nick);
-	write(srv, bufout, strlen(bufout));
-
-	snprintf(ping, sizeof(ping), "PING %s\r\n", server);
-	channel[0] = 0;
-	setbuf(stdout, NULL); /* unbuffered stdout */
-	for(;;) {
+		sout("PASS %s", password);
+	sout("NICK %s", nick);
+	sout("USER %s localhost %s :%s", nick, host, nick);
+	fflush(srv);
+	setbuf(stdout, NULL);
+	setbuf(srv, NULL);
+	for(;;) { /* main loop */
 		FD_ZERO(&rd);
 		FD_SET(0, &rd);
-		FD_SET(srv, &rd);
+		FD_SET(fileno(srv), &rd);
 		tv.tv_sec = 120;
 		tv.tv_usec = 0;
-		i = select(srv + 1, &rd, 0, 0, &tv);
+		i = select(fileno(srv) + 1, &rd, 0, 0, &tv);
 		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);
-			}
-			write(srv, ping, strlen(ping));
+			eprint("sic: error on select():");
+		}
+		else if(i == 0) {
+			if(time(NULL) - trespond >= 300)
+				eprint("sic shutting down: parse timeout\n");
+			sout("PING %s", host);
 			continue;
 		}
-		if(FD_ISSET(srv, &rd)) {
-			if(getline(srv, sizeof(bufin), bufin) == -1) {
-				perror("sic: remote server closed connection");
-				exit(EXIT_FAILURE);
-			}
+		if(FD_ISSET(fileno(srv), &rd)) {
+			if(fgets(bufin, sizeof bufin, srv) == NULL)
+				eprint("sic: remote host closed connection\n");
 			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(fgets(bufin, sizeof bufin, stdin) == NULL)
+				eprint("sic: broken pipe\n");
 			parsein(bufin);
 		}
 	}
-
 	return 0;
 }

sic.html

@@ -1,39 +0,0 @@
-<html>
-	<head>
-		<title>sic - simple irc client</title>
-		<meta name="author" content="Anselm R. Garbe">
-		<meta name="generator" content="ed">
-		<meta name="copyright" content="(C)opyright 2006 by Anselm R. Garbe">
-		<style type="text/css">
-			body {
-				color: #000000;
-				font-family: sans-serif;
-				margin: 20px 20px 20px 20px;
-			}
-		</style>
-	</head>
-	<body>
-		<center>
-			<h3>simple irc client</h3>
-		</center>
-		<h3>Description</h3>
-		<p>
-		sic is an extremly simple IRC client. It consists of lesser than 400 lines of code.
-		</p>
-		<ul>
-			<li><a href="http://10kloc.org/cgi-bin/man/man2html?query=sic">Man page</a></li>
-		</ul>
-		<h3>Download</h3>
-		<ul>
-			<li><a href="http://10kloc.org/download/sic-0.1.tar.gz">sic 0.1</a> (5kb) (20060720)</li>
-		</ul>
-		<h3>Development</h3>
-		<p>
-		You can <a href="http://10kloc.org/cgi-bin/hgwebdir.cgi/sic">browse</a> its source code repository or get a copy using <a href="http://www.selenic.com/mercurial/">Mercurial</a> with following command:
-		</p>
-		<p>
-		<code>hg clone http://10kloc.org/cgi-bin/hgwebdir.cgi/sic</code>
-		</p>
-		<p><small>--Anselm (20060719)</small></p>
-	</body>
-</html>

util.c

@@ -0,0 +1,74 @@
+/* See LICENSE file for license details. */
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+
+static void
+eprint(const char *fmt, ...) {
+	va_list ap;
+
+	va_start(ap, fmt);
+	vsnprintf(bufout, sizeof bufout, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "%s", bufout);
+	if(fmt[0] && fmt[strlen(fmt) - 1] == ':')
+		fprintf(stderr, " %s\n", strerror(errno));
+	exit(1);
+}
+
+static int
+dial(char *host, char *port) {
+	static struct addrinfo hints;
+	int srv;
+	struct addrinfo *res, *r;
+
+	memset(&hints, 0, sizeof hints);
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	if(getaddrinfo(host, port, &hints, &res) != 0)
+		eprint("error: cannot resolve hostname '%s':", host);
+	for(r = res; r; r = r->ai_next) {
+		if((srv = socket(r->ai_family, r->ai_socktype, r->ai_protocol)) == -1)
+			continue;
+		if(connect(srv, r->ai_addr, r->ai_addrlen) == 0)
+			break;
+		close(srv);
+	}
+	freeaddrinfo(res);
+	if(!r)
+		eprint("error: cannot connect to host '%s'\n", host);
+	return srv;
+}
+
+#define strlcpy _strlcpy
+static void
+strlcpy(char *to, const char *from, int l) {
+	memccpy(to, from, '\0', l);
+	to[l-1] = '\0';
+}
+
+static char *
+eat(char *s, int (*p)(int), int r) {
+	while(s != '\0' && p(*s) == r)
+		s++;
+	return s;
+}
+
+static char*
+skip(char *s, char c) {
+	while(*s != c && *s != '\0')
+		s++;
+	if(*s != '\0')
+		*s++ = '\0';
+	return s;
+}
+
+static void
+trim(char *s) {
+	char *e;
+
+	e = s + strlen(s) - 1;
+	while(isspace(*e) && e > s)
+		e--;
+	*(e + 1) = '\0';
+}