]> git.armaanb.net Git - sic.git/blobdiff - sic.c
hotfix
[sic.git] / sic.c
diff --git a/sic.c b/sic.c
index 99007d1ac274adb8b83adbeafd76c0d79f87f36f..91b2eec47f6aa148698e0f5466c6fb60e6569cca 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -1,9 +1,7 @@
-/*
- * (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * (C)opyright MMV-MMVI Nico Golde <nico at ngolde dot de>
  * See LICENSE file for license details.
  */
-
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -11,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
@@ -20,7 +19,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;
@@ -31,10 +30,10 @@ static int srv;
 static time_t trespond;
 
 static int
-getline(int fd, unsigned int len, char *buf)
-{
+getline(int fd, unsigned int len, char *buf) {
        unsigned int i = 0;
        char c;
+
        do {
                if(read(fd, &c, sizeof(char)) != sizeof(char))
                        return -1;
@@ -46,8 +45,7 @@ getline(int fd, unsigned int len, char *buf)
 }
 
 static void
-pout(char *channel, char *msg)
-{
+pout(char *channel, char *msg) {
        static char timestr[18];
        time_t t = time(0);
 
@@ -56,8 +54,7 @@ pout(char *channel, char *msg)
 }
 
 static void
-privmsg(char *channel, char *msg)
-{
+privmsg(char *channel, char *msg) {
        snprintf(bufout, sizeof(bufout), "<%s> %s", nick, msg);
        pout(channel, bufout);
        snprintf(bufout, sizeof(bufout), "PRIVMSG %s :%s\r\n", channel, msg);
@@ -65,8 +62,7 @@ privmsg(char *channel, char *msg)
 }
 
 static void
-parsein(char *msg)
-{
+parsein(char *msg) {
        char *p;
 
        if(msg[0] == 0)
@@ -75,42 +71,32 @@ parsein(char *msg)
                privmsg(channel, msg);
                return;
        }
-       if((p = strchr(&msg[3], ' ')))
-               *(p++) = 0;
-       switch (msg[1]) {
-       default:
-               snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]);
-               break;
-       case 'j':
-               if(msg[3] == '#')
-                       snprintf(bufout, sizeof(bufout), "JOIN %s\r\n", &msg[3]);
-               else if(p) {
-                       privmsg(&msg[3], p + 1);
-                       return;
-               }
-               break;
-       case 'l':
-               if(p)
-                       snprintf(bufout, sizeof(bufout), "PART %s :%s\r\n", &msg[3], p);
-               else
-                       snprintf(bufout, sizeof(bufout), "PART %s :sic\r\n", &msg[3]);
-               break;
-       case 'm':
+       if(!strncmp(msg + 1, "j ", 2) && (msg[3] == '#'))
+               snprintf(bufout, sizeof(bufout), "JOIN %s\r\n", &msg[3]);
+       else if(!strncmp(msg + 1, "l ", 2))
+               snprintf(bufout, sizeof(bufout), "PART %s :sic\r\n", &msg[3]);
+       else if(!strncmp(msg + 1, "m ", 2)) {
+               if((p = strchr(&msg[3], ' ')))
+                       *(p++) = 0;
                privmsg(&msg[3], p);
                return;
-       case 's':
+       }
+       else if(!strncmp(msg + 1, "s ", 2)) {
                strncpy(channel, &msg[3], sizeof(channel));
                return;
-       case 't':
+       }
+       else if(!strncmp(msg + 1, "t ", 2)) {
+               if((p = strchr(&msg[3], ' '))
+                       *(p++) = 0;
                snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p);
-               break;
        }
+       else
+               snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]);
        write(srv, bufout, strlen(bufout));
 }
 
 static unsigned int
-tokenize(char **result, unsigned int reslen, char *str, char delim)
-{
+tokenize(char **result, unsigned int reslen, char *str, char delim) {
        char *p, *n;
        unsigned int i = 0;
 
@@ -135,26 +121,25 @@ tokenize(char **result, unsigned int reslen, char *str, char delim)
 }
 
 static void
-parsesrv(char *msg)
-{
+parsesrv(char *msg) {
        char *argv[Tlast], *cmd, *p;
        int i;
+
        if(!msg || !(*msg))
                return;
 
        for(i = 0; i < Tlast; i++)
                argv[i] = NULL;
 
-       /*
-          <bufout>  ::= [':' <prefix> <SPACE> ] <command> <params> <crlf>
-          <prefix>   ::= <servername> | <nick> [ '!' <user> ] [ '@' <server> ]
-          <command>  ::= <letter> { <letter> } | <number> <number> <number>
-          <SPACE>    ::= ' ' { ' ' }
-          <params>   ::= <SPACE> [ ':' <trailing> | <middle> <params> ]
-          <middle>   ::= <Any *non-empty* sequence of octets not including SPACE
-          or NUL or CR or LF, the first of which may not be ':'>
-          <trailing> ::= <Any, possibly *empty*, sequence of octets not including NUL or CR or LF>
-          <crlf>     ::= CR LF
+       /* <bufout>  ::= [':' <prefix> <SPACE> ] <command> <params> <crlf>
+        * <prefix>   ::= <servername> | <nick> [ '!' <user> ] [ '@' <server> ]
+        * <command>  ::= <letter> { <letter> } | <number> <number> <number>
+        * <SPACE>    ::= ' ' { ' ' }
+        * <params>   ::= <SPACE> [ ':' <trailing> | <middle> <params> ]
+        * <middle>   ::= <Any *non-empty* sequence of octets not including SPACE
+        * or NUL or CR or LF, the first of which may not be ':'>
+        * <trailing> ::= <Any, possibly *empty*, sequence of octets not including NUL or CR or LF>
+        * <crlf>     ::= CR LF
         */
        if(msg[0] == ':') { /* check prefix */
                p = strchr(msg, ' ');
@@ -168,29 +153,28 @@ parsesrv(char *msg)
                }
        } else
                cmd = msg;
-
        /* remove CRLFs */
        for(p = cmd; p && *p != 0; p++)
                if(*p == '\r' || *p == '\n')
                        *p = 0;
-
        if((p = strchr(cmd, ':'))) {
                *p = 0;
                argv[Ttext] = ++p;
        }
        tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
-
-       if(!strncmp("PONG", argv[Tcmd], 5)) {
+       if(!strncmp("PONG", argv[Tcmd], 5))
                return;
-       else if(!strncmp("PING", argv[Tcmd], 5)) {
+       else if(!strncmp("PING", argv[Tcmd], 5)) {
                snprintf(bufout, sizeof(bufout), "PONG %s\r\n", argv[Ttext]);
                write(srv, bufout, strlen(bufout));
                return;
-       } else if(!argv[Tnick] || !argv[Tuser]) {       /* server command */
+       }
+       else if(!argv[Tnick] || !argv[Tuser]) { /* server command */
                snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : "");
                pout(server, bufout);
                return;
-       } else if(!strncmp("ERROR", argv[Tcmd], 6))
+       }
+       else if(!strncmp("ERROR", argv[Tcmd], 6))
                snprintf(bufout, sizeof(bufout), "-!- error %s",
                                argv[Ttext] ? argv[Ttext] : "unknown");
        else if(!strncmp("JOIN", argv[Tcmd], 5)) {
@@ -202,10 +186,12 @@ parsesrv(char *msg)
                argv[Tchan] = argv[Ttext];
                snprintf(bufout, sizeof(bufout), "-!- %s(%s) has joined %s",
                                argv[Tnick], argv[Tuser], argv[Ttext]);
-       } else if(!strncmp("PART", argv[Tcmd], 5)) {
+       }
+       else if(!strncmp("PART", argv[Tcmd], 5)) {
                snprintf(bufout, sizeof(bufout), "-!- %s(%s) has left %s",
                                argv[Tnick], argv[Tuser], argv[Tchan]);
-       } else if(!strncmp("MODE", argv[Tcmd], 5))
+       }
+       else if(!strncmp("MODE", argv[Tcmd], 5))
                snprintf(bufout, sizeof(bufout), "-!- %s changed mode/%s -> %s %s",
                                argv[Tnick], argv[Tcmd + 1],
                                argv[Tcmd + 2], argv[Tcmd + 3]);
@@ -236,60 +222,53 @@ parsesrv(char *msg)
 }
 
 int
-main(int argc, char *argv[])
-{
+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;
 
        nick = fullname = getenv("USER");
-       for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-               switch (argv[i][1]) {
-               default:
-                       fputs("usage: sic [-s server] [-p port] [-n nick]"
-                                       " [-k keyword] [-f fullname] [-v]\n", stderr);
-                       exit(EXIT_FAILURE);
-                       break;
-               case 's':
+       for(i = 1; i < argc; i++)
+               if(!strncmp(argv[i], "-s", 3))
                        server = argv[++i];
-                       break;
-               case 'p':
-                       port = atoi(argv[++i]);
-                       break;
-               case 'n':
+               else if(!strncmp(argv[i], "-p", 3))
+                       port = (unsigned short)atoi(argv[++i]);
+               else if(!strncmp(argv[i], "-n", 3))
                        nick = argv[++i];
-                       break;
-               case 'k':
+               else if(!strncmp(argv[i], "-k", 3))
                        password = argv[++i];
-                       break;
-               case 'f':
+               else if(!strncmp(argv[i], "-f", 3))
                        fullname = argv[++i];
-                       break;
-               case 'v':
+               else if(!strncmp(argv[i], "-v", 3)) {
                        fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
                        exit(EXIT_SUCCESS);
-                       break;
                }
-       }
+               else {
+                       fputs("usage: sic [-s server] [-p port] [-n nick]"
+                                       " [-k keyword] [-f fullname] [-v]\n", stderr);
+                       exit(EXIT_FAILURE);
+               }
 
        /* init */
        if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
                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);
                exit(EXIT_FAILURE);
        }
-
        /* login */
        if(password)
                snprintf(bufout, sizeof(bufout),
@@ -299,11 +278,11 @@ main(int argc, char *argv[])
                snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localhost %s :%s\r\n",
                                 nick, nick, server, fullname);
        write(srv, bufout, strlen(bufout));
-
        snprintf(ping, sizeof(ping), "PING %s\r\n", server);
        channel[0] = 0;
        setbuf(stdout, NULL); /* unbuffered stdout */
-       for(;;) {
+
+       for(;;) { /* main loop */
                FD_ZERO(&rd);
                FD_SET(0, &rd);
                FD_SET(srv, &rd);
@@ -339,6 +318,5 @@ main(int argc, char *argv[])
                        parsein(bufin);
                }
        }
-
        return 0;
 }