removed fullname, added support for tracking NICK changes

diff --git a/sic.1 b/sic.1
index 6408571ff1c55115781e607625ed90bc4ac62536..e43e029aabafb443175159255f7af5d4b2a99d1b 100644 (file)
--- a/sic.1
+++ b/sic.1
@@ -7,7 +7,6 @@ sic \- simple irc client
 .RB [ \-p " <port>"]
 .RB [ \-n " <nick>"]
 .RB [ \-k " <keyword>"]
-.RB [ \-f " <fullname>"]
 .RB [ \-v ]
 .SH DESCRIPTION
 .B sic
@@ -29,9 +28,6 @@ Override the default nick ($USER)
 .B \-k <keyword>
 Specifies the keyword to authenticate your nick on the server
 .TP
-.B \-f <fullname>
-Specify the real name (default is $USER)
-.TP
 .BI \-v
 Prints version information to standard output, then exits.
 .SH COMMANDS

diff --git a/sic.c b/sic.c
index ec66f19c4d4af5aae80b2f64a0cc7c2a731d9281..41be7a9fea92fca704adbcb83c6577556aa981fc 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];
@@ -148,6 +147,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 +161,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 +170,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 +196,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;