]> git.armaanb.net Git - sic.git/blobdiff - sic.c
added eprint()
[sic.git] / sic.c
diff --git a/sic.c b/sic.c
index da79dfc826454513ef60b65dc6e7624f80dbdef8..ec66f19c4d4af5aae80b2f64a0cc7c2a731d9281 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>
@@ -16,7 +17,7 @@
 #define PINGTIMEOUT 300
 #define MAXMSG 4096
 
-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;
@@ -27,6 +28,16 @@ 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;
@@ -47,12 +58,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);
@@ -70,26 +83,26 @@ 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));
 }
 
@@ -97,48 +110,45 @@ static void
 parsesrv(char *msg) {
        char *chan, *cmd, *p, *txt, *usr; 
 
+       txt = NULL;
        if(!msg || !(*msg))
                return;
-       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;
-               usr = &msg[1];
-               if((p = strchr(msg, '!')))
-                       *p = 0;
-       } 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;
+               txt = ++p;
+       }
        if(!strncmp("PONG", cmd, 4))
                return;
-       if(!strncmp("PRIVMSG", cmd, 7) || !strncmp("PING", cmd, 4)) {
+       if(!strncmp("PRIVMSG", cmd, 7) && txt) {
                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));
-               }
-               return;
+               snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt);
+               pout(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 : "");
+               pout(usr, bufout);
        }
-       snprintf(bufout, sizeof bufout, "-!- %s", cmd);
-       pout(server, bufout);
 }
 
 int
@@ -152,8 +162,8 @@ main(int argc, char *argv[]) {
 
        nick = fullname = getenv("USER");
        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]);
@@ -167,43 +177,34 @@ main(int argc, char *argv[]) {
                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] [-f fullname] [-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, fullname);
        else
                snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-                                nick, nick, server, fullname);
+                                nick, nick, host, fullname);
        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 */
 
@@ -217,29 +218,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);
                }
        }