]> git.armaanb.net Git - sic.git/blobdiff - sic.c
removed fullname, added support for tracking NICK changes
[sic.git] / sic.c
diff --git a/sic.c b/sic.c
index b1f28137d1a0878d748282ef1becae69d5495407..41be7a9fea92fca704adbcb83c6577556aa981fc 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #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;
 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 void
+eprint(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
 static int
 getline(int fd, unsigned int len, char *buf) {
        unsigned int i = 0;
@@ -49,12 +57,14 @@ pout(char *channel, char *msg) {
        static char timestr[18];
        time_t t = time(0);
 
-       strftime(timestr, sizeof timestr, "%F %R", localtime(&t));
-       fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg);
+       strftime(timestr, sizeof timestr, "%D %R", localtime(&t));
+       fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, 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);
@@ -72,153 +82,74 @@ 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 - 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], ' ')))
+               if((p = strchr(msg + 3, ' ')))
                        *(p++) = 0;
-               privmsg(&msg[3], p);
+               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) {
-       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; 
 
+       txt = NULL;
        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 */
-               if (!(p = strchr(msg, ' ')))
-                       return;
+       if(msg[0] != ':')
+               return; /* don't handle prefix-less server commands */
+       if(!(p = strchr(msg, ' ')))
+               return;
+       usr = msg + 1;
+       *p = 0;
+       cmd = ++p;
+       if((p = strchr(usr, '!')))
                *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++)
+       for(p = cmd; *p; p++) /* remove CRLFs */
                if(*p == '\r' || *p == '\n')
                        *p = 0;
        if((p = strchr(cmd, ':'))) {
                *p = 0;
-               argv[Ttext] = ++p;
+               txt = ++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));
-               return;
-       }
-       else if(!argv[Tnick] || !argv[Tuser]) { /* server command */
-               snprintf(bufout, sizeof bufout, "%s", argv[Ttext] ? argv[Ttext] : "");
-               pout(server, bufout);
+       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);
+               pout(chan, bufout);
        }
-       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("PING", cmd, 4) && txt) {
+               snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt);
+               write(srv, bufout, strlen(bufout));
        }
-       else if(!strncmp("PART", argv[Tcmd], 5)) {
-               snprintf(bufout, sizeof bufout, "-!- %s(%s) has left %s",
-                               argv[Tnick], argv[Tuser], argv[Tchan]);
+       else {
+               snprintf(bufout, sizeof bufout, ">< %s: %s", cmd, txt ? txt : "");
+               pout(usr, bufout);
+               if(!strncmp("NICK", cmd, 4) && !strncmp(usr, nick, sizeof nick) && txt)
+                       strncpy(nick, txt, sizeof nick);
        }
-       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);
 }
 
 int
@@ -230,60 +161,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))
+                       eprint("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n");
+               else
+                       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);
-       }
-       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)
+               eprint("sic: cannot connect host '%s'\n", host);
+       if(NULL == (hp = gethostbyname(host)))
+               eprint("sic: 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);
+               eprint("sic: 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);
+                               password, nick, nick, host, nick);
        else
                snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-                                nick, nick, server, fullname);
+                                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 +215,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: parse timeout");
-                               exit(EXIT_FAILURE);
-                       }
+                       eprint("sic: error on select()");
+               }
+               else if(i == 0) {
+                       if(time(NULL) - trespond >= PINGTIMEOUT)
+                               eprint("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(getline(srv, sizeof bufin, bufin) == -1)
+                               eprint("sic: 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(getline(0, sizeof bufin, bufin) == -1)
+                               eprint("sic: broken pipe");
                        parsein(bufin);
                }
        }