X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=77c6a29a4a2202799f52899743fe40b2485fac94;hb=82946e102dd8ca48b8a8df710c20bef94c649af0;hp=4edc21430f53c4a6d1513b33337906844d187bd9;hpb=264f8e9422850a8e7a5bda01d1ca04e17f553164;p=sic.git diff --git a/sic.c b/sic.c index 4edc214..77c6a29 100644 --- a/sic.c +++ b/sic.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -18,15 +19,24 @@ static char *host = "irc.oftc.net"; static unsigned short port = 6667; -static char *nick = NULL; -static char *fullname = NULL; static char *password = NULL; +static char nick[32]; static char bufin[MAXMSG], bufout[MAXMSG]; static char channel[256]; static int srv; static time_t trespond; +static void +eprint(const char *errstr, ...) { + va_list ap; + + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); + exit(EXIT_FAILURE); +} + static int getline(int fd, unsigned int len, char *buf) { unsigned int i = 0; @@ -72,26 +82,21 @@ parsein(char *msg) { return; } if(!strncmp(msg + 1, "j ", 2) && (msg[3] == '#')) - snprintf(bufout, sizeof bufout, "JOIN %s\r\n", &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 - 250 LOC are too much!\r\n", &msg[3]); + snprintf(bufout, sizeof bufout, "PART %s :sic - 250 LOC are too much!\r\n", msg + 3); else if(!strncmp(msg + 1, "m ", 2)) { - if((p = strchr(&msg[3], ' '))) + if((p = strchr(msg + 3, ' '))) *(p++) = 0; - privmsg(&msg[3], p); + privmsg(msg + 3, p); return; } else if(!strncmp(msg + 1, "s ", 2)) { - strncpy(channel, &msg[3], sizeof channel); + strncpy(channel, msg + 3, sizeof channel); return; } - 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); - } else - snprintf(bufout, sizeof bufout, "%s\r\n", &msg[1]); + snprintf(bufout, sizeof bufout, "%s\r\n", msg + 1); write(srv, bufout, strlen(bufout)); } @@ -100,18 +105,20 @@ parsesrv(char *msg) { char *chan, *cmd, *p, *txt, *usr; txt = NULL; + usr = host; if(!msg || !(*msg)) return; - pout("debug", msg); if(msg[0] != ':') - return; /* don't handle prefix-less server commands */ - if(!(p = strchr(msg, ' '))) - return; - usr = &msg[1]; - *p = 0; - cmd = ++p; - if((p = strchr(usr, '!'))) + cmd = msg; + else { + if(!(p = strchr(msg, ' '))) + return; *p = 0; + usr = msg + 1; + cmd = ++p; + if((p = strchr(usr, '!'))) + *p = 0; + } for(p = cmd; *p; p++) /* remove CRLFs */ if(*p == '\r' || *p == '\n') *p = 0; @@ -136,8 +143,10 @@ parsesrv(char *msg) { write(srv, bufout, strlen(bufout)); } else { - snprintf(bufout, sizeof bufout, "-!- %s: %s", cmd, txt ? txt : ""); + snprintf(bufout, sizeof bufout, ">< %s: %s", cmd, txt ? txt : ""); pout(usr, bufout); + if(!strncmp("NICK", cmd, 4) && !strncmp(usr, nick, sizeof nick) && txt) + strncpy(nick, txt, sizeof nick); } } @@ -150,7 +159,7 @@ main(int argc, char *argv[]) { char ping[256]; fd_set rd; - nick = fullname = getenv("USER"); + strncpy(nick, getenv("USER"), sizeof nick); for(i = 1; i < argc; i++) if(!strncmp(argv[i], "-h", 3)) { if(++i < argc) host = argv[i]; @@ -159,49 +168,36 @@ main(int argc, char *argv[]) { if(++i < argc) port = (unsigned short)atoi(argv[i]); } else if(!strncmp(argv[i], "-n", 3)) { - if(++i < argc) nick = argv[i]; + if(++i < argc) strncpy(nick, argv[i], sizeof nick); } else if(!strncmp(argv[i], "-k", 3)) { if(++i < argc) password = argv[i]; } - else if(!strncmp(argv[i], "-f", 3)) { - if(++i < argc) fullname = argv[i]; - } - else if(!strncmp(argv[i], "-v", 3)) { - fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); - exit(EXIT_SUCCESS); - } - else { - fputs("usage: sic [-h host] [-p port] [-n nick]" - " [-k keyword] [-f fullname] [-v]\n", stderr); - exit(EXIT_FAILURE); - } + else if(!strncmp(argv[i], "-v", 3)) + eprint("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n"); + else + eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n"); /* init */ - if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "sic: cannot connect host '%s'\n", host); - exit(EXIT_FAILURE); - } - if (NULL == (hp = gethostbyname(host))) { - fprintf(stderr, "sic: cannot resolve hostname '%s'\n", host); - exit(EXIT_FAILURE); - } + if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) + eprint("sic: cannot connect host '%s'\n", host); + if(NULL == (hp = gethostbyname(host))) + eprint("sic: cannot resolve hostname '%s'\n", host); addr.sin_family = AF_INET; addr.sin_port = htons(port); 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 host '%s'\n", host); - exit(EXIT_FAILURE); + eprint("sic: cannot connect host '%s'\n", host); } /* login */ if(password) snprintf(bufout, sizeof bufout, "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n", - password, nick, nick, host, fullname); + password, nick, nick, host, nick); else snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n", - nick, nick, host, fullname); + nick, nick, host, nick); write(srv, bufout, strlen(bufout)); snprintf(ping, sizeof ping, "PING %s\r\n", host); channel[0] = 0; @@ -217,29 +213,23 @@ main(int argc, char *argv[]) { if(i < 0) { if(errno == EINTR) continue; - perror("sic: error on select()"); - exit(EXIT_FAILURE); - } else if(i == 0) { - if(time(NULL) - trespond >= PINGTIMEOUT) { - pout(host, "-!- sic shutting down: parse timeout"); - exit(EXIT_FAILURE); - } + eprint("sic: error on select()"); + } + else if(i == 0) { + if(time(NULL) - trespond >= PINGTIMEOUT) + eprint("sic shutting down: parse timeout"); write(srv, ping, strlen(ping)); continue; } if(FD_ISSET(srv, &rd)) { - if(getline(srv, sizeof bufin, bufin) == -1) { - perror("sic: remote host closed connection"); - exit(EXIT_FAILURE); - } + if(getline(srv, sizeof bufin, bufin) == -1) + eprint("sic: remote host closed connection"); parsesrv(bufin); trespond = time(NULL); } if(FD_ISSET(0, &rd)) { - if(getline(0, sizeof bufin, bufin) == -1) { - perror("sic: broken pipe"); - exit(EXIT_FAILURE); - } + if(getline(0, sizeof bufin, bufin) == -1) + eprint("sic: broken pipe"); parsein(bufin); } }