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

diff --git a/sic.c b/sic.c
index 8d77a0f..c1e428e 100644
--- a/sic.c
+++ b/sic.c
@@ -1,247 +1,222 @@
-/* (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 <sys/select.h>
+
+#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 <time.h>
 #include <unistd.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#define PINGTIMEOUT 300
-#define MAXMSG 4096
 
-static char *host = "irc.oftc.net";
-static unsigned short port = 6667;
-static char *nick = NULL;
-static char *fullname = NULL;
-static char *password = NULL;
+#include "arg.h"
+#include "config.h"
 
-static char bufin[MAXMSG], bufout[MAXMSG];
+char *argv0;
+static char *host = DEFAULT_HOST;
+static char *port = DEFAULT_PORT;
+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;
+#undef strlcpy
+#include "strlcpy.c"
+#include "util.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;
+static void
+pout(char *channel, char *fmt, ...) {
+	static char timestr[80];
+	time_t t;
+	va_list ap;
+
+	va_start(ap, fmt);
+	vsnprintf(bufout, sizeof bufout, fmt, ap);
+	va_end(ap);
+	t = time(NULL);
+	strftime(timestr, sizeof timestr, TIMESTAMP_FORMAT, localtime(&t));
+	fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout);
 }
 
 static void
-pout(char *channel, char *msg) {
-	static char timestr[18];
-	time_t t = time(0);
+sout(char *fmt, ...) {
+	va_list ap;
 
-	strftime(timestr, sizeof timestr, "%F %R", localtime(&t));
-	fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg);
+	va_start(ap, fmt);
+	vsnprintf(bufout, sizeof bufout, fmt, ap);
+	va_end(ap);
+	fprintf(srv, "%s\r\n", bufout);
 }
 
 static void
 privmsg(char *channel, char *msg) {
-	if(channel[0] == 0)
+	if(channel[0] == '\0') {
+		pout("", "No channel to send to");
 		return;
-	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));
+	}
+	pout(channel, "<%s> %s", nick, msg);
+	sout("PRIVMSG %s :%s", channel, msg);
 }
 
 static void
-parsein(char *msg) {
-	char *p;
+parsein(char *s) {
+	char c, *p;
 
-	if(msg[0] == 0)
-		return;
-	if(msg[0] != ':') {
-		privmsg(channel, msg);
+	if(s[0] == '\0')
 		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);
+	skip(s, '\n');
+	if(s[0] != COMMAND_PREFIX_CHARACTER) {
+		privmsg(channel, s);
 		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);
+	c = *++s;
+	if(c != '\0' && isspace((unsigned char)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 = DEFAULT_PARTING_MESSAGE;
+			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;
+		}
 	}
-	else
-		snprintf(bufout, sizeof bufout, "%s\r\n", &msg[1]);
-	write(srv, bufout, strlen(bufout));
+	sout("%s", s);
 }
 
 static void
-parsesrv(char *msg) {
-	char *chan, *cmd, *p, *txt, *usr; 
+parsesrv(char *cmd) {
+	char *usr, *par, *txt;
 
-	if(!msg || !(*msg))
+	usr = host;
+	if(!cmd || !*cmd)
 		return;
-	pout("debug", msg);
-	if(msg[0] == ':') { /* check prefix */
-		if(!(p = strchr(msg, ' ')))
+	if(cmd[0] == ':') {
+		usr = cmd + 1;
+		cmd = skip(usr, ' ');
+		if(cmd[0] == '\0')
 			return;
-		*p = 0;
-		usr = &msg[1];
-		cmd = ++p;
-		if((p = strchr(usr, '!')))
-			*p = 0;
-	} else
-		cmd = msg;
-	/* remove CRLFs */
-	for(p = cmd; *p; p++)
-		if(*p == '\r' || *p == '\n')
-			*p = 0;
-	if(!strncmp("PONG", cmd, 4))
-		return;
-	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);
-		}
-		else if(!strncmp("PING", cmd, 5) && txt) {
-			snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt);
-			write(srv, bufout, strlen(bufout));
-		}
+		skip(usr, '!');
+	}
+	skip(cmd, '\r');
+	par = skip(cmd, ' ');
+	txt = skip(par, ':');
+	trim(par);
+	if(!strcmp("PONG", cmd))
 		return;
+	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);
 	}
-	snprintf(bufout, sizeof bufout, "-!- %s", cmd);
-	pout(host, bufout);
+}
+
+
+static void
+usage(void) {
+	eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n", argv0);
 }
 
 int
 main(int argc, char *argv[]) {
-	int i;
 	struct timeval tv;
-	struct hostent *hp;
-	static struct sockaddr_in addr;  /* initially filled with 0's */
-	char ping[256];
+	const char *user = getenv("USER");
+	int n;
 	fd_set rd;
 
-	nick = fullname = getenv("USER");
-	for(i = 1; i < argc; 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];
-		}
-		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 [-h host] [-p port] [-n nick]"
-					" [-k keyword] [-f fullname] [-v]\n", stderr);
-			exit(EXIT_FAILURE);
-		}
+	strlcpy(nick, user ? user : "unknown", sizeof nick);
+	ARGBEGIN {
+	case 'h':
+		host = EARGF(usage());
+		break;
+	case 'p':
+		port = EARGF(usage());
+		break;
+	case 'n':
+		strlcpy(nick, EARGF(usage()), sizeof nick);
+		break;
+	case 'k':
+		password = EARGF(usage());
+		break;
+	case 'v':
+		eprint("sic-"VERSION", © 2005-2014 Kris Maglione, Anselm R. Garbe, Nico Golde\n");
+		break;
+	default:
+		usage();
+	} ARGEND;
 
 	/* init */
-	if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-		fprintf(stderr, "sic: cannot connect host '%s'\n", host);
-		exit(EXIT_FAILURE);
-	}
-	if (NULL == (hp = gethostbyname(host))) {
-		fprintf(stderr, "sic: cannot resolve hostname '%s'\n", host);
-		exit(EXIT_FAILURE);
-	}
-	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 host '%s'\n", host);
-		exit(EXIT_FAILURE);
-	}
+	srv = fdopen(dial(host, port), "r+");
+	if (!srv)
+		eprint("fdopen:");
 	/* login */
 	if(password)
-		snprintf(bufout, sizeof bufout,
-				"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
-				password, nick, nick, host, fullname);
-	else
-		snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-				 nick, nick, host, fullname);
-	write(srv, bufout, strlen(bufout));
-	snprintf(ping, sizeof ping, "PING %s\r\n", host);
-	channel[0] = 0;
-	setbuf(stdout, NULL); /* unbuffered stdout */
-
+		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);
+	setbuf(stdin, NULL);
+#ifdef __OpenBSD__
+	if (pledge("stdio", NULL) == -1)
+		eprint("error: pledge:");
+#endif
 	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);
-		if(i < 0) {
+		n = select(fileno(srv) + 1, &rd, 0, 0, &tv);
+		if(n < 0) {
 			if(errno == EINTR)
 				continue;
-			perror("sic: error on select()");
-			exit(EXIT_FAILURE);
-		} else if(i == 0) {
-			if(time(NULL) - trespond >= PINGTIMEOUT) {
-				pout(host, "-!- sic shutting down: parse timeout");
-				exit(EXIT_FAILURE);
-			}
-			write(srv, ping, strlen(ping));
+			eprint("sic: error on select():");
+		}
+		else if(n == 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 host 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);
 		}
 	}