]> git.armaanb.net Git - sic.git/blobdiff - sic.c
updated sic
[sic.git] / sic.c
diff --git a/sic.c b/sic.c
index 53547929f6dad5a0af72fcc853ee358ac2d629a4..059ad9ace17e67bc9dae4b13bd10d9079a4ae90f 100644 (file)
--- a/sic.c
+++ b/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>
 #include <sys/time.h>
 
 #define PINGTIMEOUT 300
-#define MAXMSG 4096
+#define MAXMSG      4096
 
-static char *server = "irc.oftc.net";
+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 *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) {
-       unsigned int i = 0;
-       char c;
+void
+die(const char *errstr, ...) {
+       va_list ap;
 
-       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;
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
 }
 
-static void
-pout(char *channel, char *msg) {
+void
+printl(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
+void
 privmsg(char *channel, char *msg) {
        if(channel[0] == 0)
                return;
        snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg);
-       pout(channel, bufout);
+       printl(channel, bufout);
        snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg);
        write(srv, bufout, strlen(bufout));
 }
 
-static void
+void
 parsein(char *msg) {
        char *p;
 
@@ -72,76 +73,90 @@ 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], ' ')))
-                       *(p++) = 0;
-               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 void
+void
 parsesrv(char *msg) {
        char *chan, *cmd, *p, *txt, *usr; 
 
+       txt = NULL;
+       usr = host;
        if(!msg || !(*msg))
                return;
-       if(msg[0] == ':') { /* check prefix */
+       if(msg[0] != ':')
+               cmd = msg;
+       else {
                if(!(p = strchr(msg, ' ')))
                        return;
                *p = 0;
-               usr = &msg[1];
+               usr = msg + 1;
                cmd = ++p;
                if((p = strchr(usr, '!')))
                        *p = 0;
-       } else
-               cmd = msg;
-       /* remove CRLFs */
-       for(p = cmd; *p; 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);
+               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;
+
+       do {
+               if(read(fd, &c, sizeof(char)) != sizeof(char))
+                       return -1;
+               buf[i++] = c;
        }
-       snprintf(bufout, sizeof bufout, "-!- %s", cmd);
-       pout(server, bufout);
+       while(c != '\n' && i < len);
+       buf[i - 1] = 0;
+       return 0;
 }
 
+
 int
 main(int argc, char *argv[]) {
        int i;
@@ -151,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);
+                       "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);
+                        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 */
 
@@ -218,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: parse 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);
                }
        }