applied a fix inspired by recent wmii commit

[sic.git] / sic.c

diff --git a/sic.c b/sic.c
index ec66f19c4d4af5aae80b2f64a0cc7c2a731d9281..77c6a29a4a2202799f52899743fe40b2485fac94 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -19,9 +19,8 @@
 
 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];
@@ -96,11 +95,6 @@ parsein(char *msg) {
                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);
        write(srv, bufout, strlen(bufout));
@@ -111,17 +105,20 @@ parsesrv(char *msg) {
        char *chan, *cmd, *p, *txt, *usr; 
 
        txt = NULL;
+       usr = host;
        if(!msg || !(*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, '!')))
+               cmd = msg;
+       else {
+               if(!(p = strchr(msg, ' ')))
+                       return;
                *p = 0;
+               usr = msg + 1;
+               cmd = ++p;
+               if((p = strchr(usr, '!')))
+                       *p = 0;
+       }
        for(p = cmd; *p; p++) /* remove CRLFs */
                if(*p == '\r' || *p == '\n')
                        *p = 0;
@@ -148,6 +145,8 @@ parsesrv(char *msg) {
        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);
        }
 }
 
@@ -160,7 +159,7 @@ 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], "-h", 3)) {
                        if(++i < argc) host = argv[i];
@@ -169,19 +168,15 @@ main(int argc, char *argv[]) {
                        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))
                        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");
+                       eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
 
        /* init */
        if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0)
@@ -199,10 +194,10 @@ main(int argc, char *argv[]) {
        if(password)
                snprintf(bufout, sizeof bufout,
                                "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
-                               password, nick, nick, host, fullname);
+                               password, nick, nick, host, nick);
        else
                snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-                                nick, nick, host, fullname);
+                                nick, nick, host, nick);
        write(srv, bufout, strlen(bufout));
        snprintf(ping, sizeof ping, "PING %s\r\n", host);
        channel[0] = 0;