reversed the -u switch

diff --git a/LICENSE b/LICENSE
index c6d9111ecac4d3b170b20f6ce4af38eaa081fd2b..8c6727eff363378782bc468603df4d0f79b37426 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT/X Consortium License
 
-© 2005-2009 Anselm R Garbe <anselm@garbe.us>
+© 2005-2012 Anselm R Garbe <anselm@garbe.us>
 © 2008-2009 Jeroen Schot <schot@a-eskwadraat.nl>
 © 2007-2009 Kris Maglione <maglione.k@gmail.com>
 © 2005 Nico Golde <nico at ngolde dot de>

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