Added tag 0.2 for changeset 56350a01f27753cfbdbb3dbc25f2a53dd4c2ac45

[sic.git] / sic.c

diff --git a/sic.c b/sic.c
index 028cdef2560d6c9bf5e55204691525ead60a9630..99007d1ac274adb8b83adbeafd76c0d79f87f36f 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -52,13 +52,13 @@ pout(char *channel, char *msg)
        time_t t = time(0);
 
        strftime(timestr, sizeof(timestr), "%a %R", localtime(&t));
-       fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, msg);
+       fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg);
 }
 
 static void
 privmsg(char *channel, char *msg)
 {
-       snprintf(bufout, sizeof(bufout), "<%12s> %s", nick, msg);
+       snprintf(bufout, sizeof(bufout), "<%s> %s", nick, msg);
        pout(channel, bufout);
        snprintf(bufout, sizeof(bufout), "PRIVMSG %s :%s\r\n", channel, msg);
        write(srv, bufout, strlen(bufout));
@@ -69,6 +69,8 @@ parsein(char *msg)
 {
        char *p;
 
+       if(msg[0] == 0)
+               return;
        if(msg[0] != '/') {
                privmsg(channel, msg);
                return;
@@ -225,7 +227,7 @@ parsesrv(char *msg)
                snprintf(bufout, sizeof(bufout), "-!- \"%s\")",
                                argv[Ttext] ? argv[Ttext] : "");
        else if(!strncmp("PRIVMSG", argv[Tcmd], 8))
-               snprintf(bufout, sizeof(bufout), "<%12s> %s",
+               snprintf(bufout, sizeof(bufout), "<%s> %s",
                                argv[Tnick], argv[Ttext] ? argv[Ttext] : "");
        if(!argv[Tchan] || !strncmp(argv[Tchan], nick, strlen(nick)))
                pout(argv[Tnick], bufout);
@@ -243,10 +245,6 @@ main(int argc, char *argv[])
        char ping[256];
        fd_set rd;
 
-       pout(server, "test 123");
-       pout(server, "test whdhwdwjdw djwhdwkjdwhk dwhdwkdw 123");
-       pout("kjfwefiuewu", "test 123");
-       pout(server, "test dwdw 123");
        nick = fullname = getenv("USER");
        for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
                switch (argv[i][1]) {
@@ -296,10 +294,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, server, fullname ? fullname : nick);
+                               password, nick, nick, server, fullname);
        else
                snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-                                nick, nick, server, fullname ? fullname : nick);
+                                nick, nick, server, fullname);
        write(srv, bufout, strlen(bufout));
 
        snprintf(ping, sizeof(ping), "PING %s\r\n", server);