From bade9ccb6cc6e1e4969644ca8d96ad9c32de23f4 Mon Sep 17 00:00:00 2001 From: "anselm@garbe.us" Date: Sun, 5 Feb 2012 16:47:38 +0100 Subject: [PATCH] reversed the -u switch --- LICENSE | 2 +- sic.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index c6d9111..8c6727e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT/X Consortium License -© 2005-2009 Anselm R Garbe +© 2005-2012 Anselm R Garbe © 2008-2009 Jeroen Schot © 2007-2009 Kris Maglione © 2005 Nico Golde diff --git a/sic.c b/sic.c index c5d1692..d93c2ec 100644 --- 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); -- 2.39.2