X-Git-Url: https://git.armaanb.net/?p=sic.git;a=blobdiff_plain;f=sic.c;h=c1e428effa57a8675c123f100d122a1971a210a2;hp=121b3ee336311be04ddeb77f2c657d1420e97a0c;hb=HEAD;hpb=4a4f924fee3f3779e5856eabaed7672ca8d92a77 diff --git a/sic.c b/sic.c index 121b3ee..c1e428e 100644 --- a/sic.c +++ b/sic.c @@ -1,248 +1,222 @@ -/* See LICENSE file for license details. */ + /* See LICENSE file for license details. */ +#include + +#include #include -#include -#include #include #include #include #include #include #include -#include -#include - -#define PINGTIMEOUT 300 -#define MAXMSG 4096 -#ifndef VERSION -#define VERSION "dev" -#endif -static void die(const char *errstr, ...); -static void printl(char *channel, char *msg); -static void privmsg(char *channel, char *msg); -static void parsein(char *msg); -static void parsesrv(char *msg); -static int readl(int fd, unsigned int len, char *buf); +#include "arg.h" +#include "config.h" -static char *host = "irc6.oftc.net"; -static char *port = "6667"; +char *argv0; +static char *host = DEFAULT_HOST; +static char *port = DEFAULT_PORT; +static char *password; static char nick[32]; - -static char bufin[MAXMSG], bufout[MAXMSG]; +static char bufin[4096]; +static char bufout[4096]; static char channel[256]; -static int srv; static time_t trespond; +static FILE *srv; + +#undef strlcpy +#include "strlcpy.c" +#include "util.c" -void -die(const char *errstr, ...) { +static void +pout(char *channel, char *fmt, ...) { + static char timestr[80]; + time_t t; va_list ap; - va_start(ap, errstr); - (void) vfprintf(stderr, errstr, ap); + + va_start(ap, fmt); + vsnprintf(bufout, sizeof bufout, fmt, ap); va_end(ap); - exit(EXIT_FAILURE); + t = time(NULL); + strftime(timestr, sizeof timestr, TIMESTAMP_FORMAT, localtime(&t)); + fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout); } -void -printl(char *channel, char *msg) { - static char timestr[18]; - time_t t = time(0); - (void) strftime(timestr, sizeof timestr, "%D %R", localtime(&t)); - fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, msg); +static void +sout(char *fmt, ...) { + va_list ap; + + va_start(ap, fmt); + vsnprintf(bufout, sizeof bufout, fmt, ap); + va_end(ap); + fprintf(srv, "%s\r\n", bufout); } -void +static void privmsg(char *channel, char *msg) { - if(channel[0] == '\0') + if(channel[0] == '\0') { + pout("", "No channel to send to"); return; - (void) snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg); - printl(channel, bufout); - (void) snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg); - (void) write(srv, bufout, strlen(bufout)); + } + pout(channel, "<%s> %s", nick, msg); + sout("PRIVMSG %s :%s", channel, msg); } -void -parsein(char *msg) { - char *p = NULL; - if(msg[0] == '\0') - return; - if(msg[0] != ':') { - privmsg(channel, msg); +static void +parsein(char *s) { + char c, *p; + + if(s[0] == '\0') return; - } - if(strncmp(msg + 1, "j ", 2) == 0 && (msg[3] == '#')) - (void) snprintf(bufout, sizeof bufout, "JOIN %s\r\n", msg + 3); - else if(strncmp(msg + 1, "l ", 2) == 0) - (void) snprintf(bufout, sizeof bufout, "PART %s :sic - 250 LOC are too much!\r\n", msg + 3); - else if(strncmp(msg + 1, "m ", 2) == 0) { - if((p = strchr(msg + 3, ' '))) - *(p++) = '\0'; - privmsg(msg + 3, p); + skip(s, '\n'); + if(s[0] != COMMAND_PREFIX_CHARACTER) { + privmsg(channel, s); return; } - else if(strncmp(msg + 1, "s ", 2) == 0) { - strncpy(channel, msg + 3, sizeof channel); - return; + c = *++s; + if(c != '\0' && isspace((unsigned char)s[1])) { + p = s + 2; + switch(c) { + case 'j': + sout("JOIN %s", p); + if(channel[0] == '\0') + strlcpy(channel, p, sizeof channel); + return; + case 'l': + s = eat(p, isspace, 1); + p = eat(s, isspace, 0); + if(!*s) + s = channel; + if(*p) + *p++ = '\0'; + if(!*p) + p = DEFAULT_PARTING_MESSAGE; + sout("PART %s :%s", s, p); + return; + case 'm': + s = eat(p, isspace, 1); + p = eat(s, isspace, 0); + if(*p) + *p++ = '\0'; + privmsg(s, p); + return; + case 's': + strlcpy(channel, p, sizeof channel); + return; + } } - else - (void) snprintf(bufout, sizeof bufout, "%s\r\n", msg + 1); - (void) write(srv, bufout, strlen(bufout)); + sout("%s", s); } -void -parsesrv(char *msg) { - char *chan, *cmd, *p, *txt, *usr; +static void +parsesrv(char *cmd) { + char *usr, *par, *txt; - txt = NULL; usr = host; - if(msg == NULL || *msg == '\0' ) + if(!cmd || !*cmd) return; - if(msg[0] != ':') - cmd = msg; - else { - if(!(p = strchr(msg, ' '))) + if(cmd[0] == ':') { + usr = cmd + 1; + cmd = skip(usr, ' '); + if(cmd[0] == '\0') return; - *p = '\0'; - usr = msg + 1; - cmd = ++p; - if((p = strchr(usr, '!'))) - *p = '\0'; - } - for(p = cmd; *p != '\0'; p++) /* remove CRLFs */ - if(*p == '\r' || *p == '\n') - *p = '\0'; - if((p = strchr(cmd, ':'))) { - *p = '\0'; - txt = ++p; + skip(usr, '!'); } - if(strncmp("PONG", cmd, 4) == 0) + skip(cmd, '\r'); + par = skip(cmd, ' '); + txt = skip(par, ':'); + trim(par); + if(!strcmp("PONG", cmd)) return; - if(strncmp("PRIVMSG", cmd, 7) == 0 && txt != NULL) { - if(!(p = strchr(cmd, ' '))) - return; - *p = '\0'; - chan = ++p; - for(; *p != '\0' && *p != ' '; p++); - *p = '\0'; - (void) snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt); - printl(chan, bufout); - } - else if(strncmp("PING", cmd, 4) == 0 && txt != NULL) { - (void) snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt); - (void) write(srv, bufout, strlen(bufout)); - } + if(!strcmp("PRIVMSG", cmd)) + pout(par, "<%s> %s", usr, txt); + else if(!strcmp("PING", cmd)) + sout("PONG %s", txt); else { - if (txt != NULL) - (void) snprintf(bufout, sizeof bufout, ">< %s: %s", cmd, txt); - else - (void) snprintf(bufout, sizeof bufout, ">< %s: ", cmd); - printl(usr, bufout); - if(strncmp("NICK", cmd, 4) == 0 && strncmp(usr, nick, sizeof nick) == 0 && - txt != NULL) - (void) strncpy(nick, txt, sizeof nick); + pout(usr, ">< %s (%s): %s", cmd, par, txt); + if(!strcmp("NICK", cmd) && !strcmp(usr, nick)) + strlcpy(nick, txt, sizeof nick); } } -int -readl(int fd, unsigned int len, char *buf) { - unsigned int i = 0; - char c = '\0'; - - do { - if(read(fd, &c, sizeof(char)) != (ssize_t) sizeof(char)) - return -1; - buf[i++] = c; - } - while(c != '\n' && i < len); - buf[i - 1] = '\0'; - return 0; -} +static void +usage(void) { + eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n", argv0); +} int -main(const int argc, char *const argv[]) { - int i; +main(int argc, char *argv[]) { struct timeval tv; - static struct addrinfo hints, *res, *r; - char ping[256]; + const char *user = getenv("USER"); + int n; fd_set rd; - char *password = NULL; - strncpy(nick, getenv("USER"), sizeof nick); - for(i = 1; i < argc; i++) - if(strncmp(argv[i], "-h", 3) == 0) { - if(++i < argc) host = argv[i]; - } - else if(strncmp(argv[i], "-p", 3) == 0) { - if(++i < argc) port = argv[i]; - } - else if(strncmp(argv[i], "-n", 3) == 0) { - if(++i < argc) strncpy(nick, argv[i], sizeof nick); - } - else if(strncmp(argv[i], "-k", 3) == 0) { - if(++i < argc) password = argv[i]; - } - else if(strncmp(argv[i], "-v", 3) == 0) - die("sic-%s, © 2005-2009 sic engineers\n", VERSION); - else - die("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n"); + strlcpy(nick, user ? user : "unknown", sizeof nick); + ARGBEGIN { + case 'h': + host = EARGF(usage()); + break; + case 'p': + port = EARGF(usage()); + break; + case 'n': + strlcpy(nick, EARGF(usage()), sizeof nick); + break; + case 'k': + password = EARGF(usage()); + break; + case 'v': + eprint("sic-"VERSION", © 2005-2014 Kris Maglione, Anselm R. Garbe, Nico Golde\n"); + break; + default: + usage(); + } ARGEND; /* init */ - memset(&hints, 0, sizeof hints); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - if(getaddrinfo(host, port, &hints, &res) != 0) - die("error: cannot resolve hostname '%s'\n", host); - for(r = res; r; r = r->ai_next) { - if((srv = socket(r->ai_family, r->ai_socktype, r->ai_protocol)) == -1) - continue; - if(connect(srv, r->ai_addr, r->ai_addrlen) == 0) - break; - (void) close(srv); - } - freeaddrinfo(res); - if(!r) - die("error: cannot connect to host '%s'\n", host); - + srv = fdopen(dial(host, port), "r+"); + if (!srv) + eprint("fdopen:"); /* login */ - if (password) - (void) snprintf(bufout, sizeof bufout, - "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n", - password, nick, nick, host, nick); - else - (void) snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n", - nick, nick, host, nick); - (void) write(srv, bufout, strlen(bufout)); - (void) snprintf(ping, sizeof ping, "PING %s\r\n", host); - channel[0] = '\0'; - setbuf(stdout, NULL); /* unbuffered stdout */ - + if(password) + sout("PASS %s", password); + sout("NICK %s", nick); + sout("USER %s localhost %s :%s", nick, host, nick); + fflush(srv); + setbuf(stdout, NULL); + setbuf(srv, NULL); + setbuf(stdin, NULL); +#ifdef __OpenBSD__ + if (pledge("stdio", NULL) == -1) + eprint("error: pledge:"); +#endif for(;;) { /* main loop */ FD_ZERO(&rd); FD_SET(0, &rd); - FD_SET(srv, &rd); + FD_SET(fileno(srv), &rd); tv.tv_sec = 120; tv.tv_usec = 0; - i = select(srv + 1, &rd, 0, 0, &tv); - if(i < 0) { + n = select(fileno(srv) + 1, &rd, 0, 0, &tv); + if(n < 0) { if(errno == EINTR) continue; - die("error: error on select()\n"); + eprint("sic: error on select():"); } - else if(i == 0) { - if(time(NULL) - trespond >= PINGTIMEOUT) - die("error: sic shutting down: parse timeout\n"); - (void) write(srv, ping, strlen(ping)); + else if(n == 0) { + if(time(NULL) - trespond >= 300) + eprint("sic shutting down: parse timeout\n"); + sout("PING %s", host); continue; } - if(FD_ISSET(srv, &rd) != 0) { - if(readl(srv, sizeof bufin, bufin) == -1) - die("error: remote host closed connection\n"); + if(FD_ISSET(fileno(srv), &rd)) { + if(fgets(bufin, sizeof bufin, srv) == NULL) + eprint("sic: remote host closed connection\n"); parsesrv(bufin); trespond = time(NULL); } - if(FD_ISSET(0, &rd) != 0) { - if(readl(0, (unsigned int) sizeof bufin, bufin) == -1) - die("error: broken pipe\n"); + if(FD_ISSET(0, &rd)) { + if(fgets(bufin, sizeof bufin, stdin) == NULL) + eprint("sic: broken pipe\n"); parsein(bufin); } }