applied Quentin Carbonneaux's user patch

diff --git a/sic.c b/sic.c
index f4e2d3dd7413e0bd3d3023c45f44c1cb2eb4b7e5..c5d1692e600cffafc77c21a6fa597edf7083f1fb 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -138,7 +138,8 @@ main(int argc, char *argv[]) {
        const char *user = getenv("USER");
        fd_set rd;
 
-       strlcpy(nick, user ? user : "unknown", sizeof nick);
+       if (!user) user = "unknown";
+       strlcpy(nick, user, sizeof nick);
        for(i = 1; i < argc; i++) {
                c = argv[i][1];
                if(argv[i][0] != '-' || argv[i][2])
@@ -156,10 +157,13 @@ main(int argc, char *argv[]) {
                case 'k':
                        if(++i < argc) password = argv[i];
                        break;
+               case 'u':
+                       if (++i < argc) user = argv[i];
+                       break;
                case 'v':
                        eprint("sic-"VERSION", © 2005-2009 Kris Maglione, Anselm R. Garbe, Nico Golde\n");
                default:
-                       eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
+                       eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-u user] [-v]\n");
                }
        }
        /* init */
@@ -169,7 +173,7 @@ main(int argc, char *argv[]) {
        if(password)
                sout("PASS %s", password);
        sout("NICK %s", nick);
-       sout("USER %s localhost %s :%s", nick, host, nick);
+       sout("USER %s localhost %s :%s", user, host, nick);
        fflush(srv);
        setbuf(stdout, NULL);
        setbuf(srv, NULL);