applied Adriens patch

[sic.git] / sic.c

diff --git a/sic.c b/sic.c
index 9393c53d50d2f628ef87bbf144744a4692712ae1..8d6580918df69c13a3395d71654876350af4e4c5 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
@@ -20,7 +21,7 @@
 enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
 
 static char *server = "irc.oftc.net";
-static int port = 6667;
+static unsigned short port = 6667;
 static char *nick = NULL;
 static char *fullname = NULL;
 static char *password = NULL;
@@ -52,7 +53,7 @@ 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
@@ -241,7 +242,7 @@ main(int argc, char *argv[])
        int i;
        struct timeval tv;
        struct hostent *hp;
-       struct sockaddr_in addr = { 0 };
+       static struct sockaddr_in addr;  /* initially filled with 0's */
        char ping[256];
        fd_set rd;
 
@@ -257,7 +258,7 @@ main(int argc, char *argv[])
                        server = argv[++i];
                        break;
                case 'p':
-                       port = atoi(argv[++i]);
+                       port = (unsigned short)atoi(argv[++i]);
                        break;
                case 'n':
                        nick = argv[++i];
@@ -280,10 +281,13 @@ main(int argc, char *argv[])
                fprintf(stderr, "sic: cannot connect server '%s'\n", server);
                exit(EXIT_FAILURE);
        }
-       hp = gethostbyname(server);
+       if (NULL == (hp = gethostbyname(server))) {
+               fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server);
+               exit(EXIT_FAILURE);
+       }
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);
-       bcopy(hp->h_addr, &addr.sin_addr, hp->h_length);
+       memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
        if(connect(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_in))) {
                close(srv);
                fprintf(stderr, "sic: cannot connect server '%s'\n", server);
@@ -294,10 +298,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);