]> git.armaanb.net Git - sic.git/blobdiff - sic.c
Initial config changes
[sic.git] / sic.c
diff --git a/sic.c b/sic.c
index 66a58d31067bd4a21839f47a1a9196e1065d092f..c1e428effa57a8675c123f100d122a1971a210a2 100644 (file)
--- a/sic.c
+++ b/sic.c
-/*
- * (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.
- */
+ /* See LICENSE file for license details. */
+#include <sys/select.h>
 
+#include <ctype.h>
 #include <errno.h>
-#include <netdb.h>
-#include <netinet/in.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <time.h>
-
-#define PINGTIMEOUT 300
-#define MAXMSG 4096
-
-enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
-
-static char *server = "irc.oftc.net";
-static int port = 6667;
-static char *nick = NULL;
-static char *fullname = NULL;
-static char *password = NULL;
-
-static char bufin[MAXMSG], bufout[MAXMSG];
+#include <unistd.h>
+
+#include "arg.h"
+#include "config.h"
+
+char *argv0;
+static char *host = DEFAULT_HOST;
+static char *port = DEFAULT_PORT;
+static char *password;
+static char nick[32];
+static char bufin[4096];
+static char bufout[4096];
 static char channel[256];
-static int srv;
 static time_t trespond;
+static FILE *srv;
 
-static int
-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;
-               buf[i++] = c;
-       }
-       while(c != '\n' && i < len);
-       buf[i - 1] = 0;
-       return 0;
+#undef strlcpy
+#include "strlcpy.c"
+#include "util.c"
+
+static void
+pout(char *channel, char *fmt, ...) {
+       static char timestr[80];
+       time_t t;
+       va_list ap;
+
+       va_start(ap, fmt);
+       vsnprintf(bufout, sizeof bufout, fmt, ap);
+       va_end(ap);
+       t = time(NULL);
+       strftime(timestr, sizeof timestr, TIMESTAMP_FORMAT, localtime(&t));
+       fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout);
 }
 
 static void
-pout(char *channel, char *msg)
-{
-       static char timestr[18];
-       time_t t = time(0);
+sout(char *fmt, ...) {
+       va_list ap;
 
-       strftime(timestr, sizeof(timestr), "%a %R", localtime(&t));
-       fprintf(stdout, "%s: %s %s\n", channel, timestr, msg);
+       va_start(ap, fmt);
+       vsnprintf(bufout, sizeof bufout, fmt, ap);
+       va_end(ap);
+       fprintf(srv, "%s\r\n", bufout);
 }
 
 static void
-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);
-       write(srv, bufout, strlen(bufout));
+privmsg(char *channel, char *msg) {
+       if(channel[0] == '\0') {
+               pout("", "No channel to send to");
+               return;
+       }
+       pout(channel, "<%s> %s", nick, msg);
+       sout("PRIVMSG %s :%s", channel, msg);
 }
 
 static void
-parsein(char *msg)
-{
-       char *p;
+parsein(char *s) {
+       char c, *p;
 
-       if(msg[0] != '/') {
-               privmsg(channel, msg);
+       if(s[0] == '\0')
+               return;
+       skip(s, '\n');
+       if(s[0] != COMMAND_PREFIX_CHARACTER) {
+               privmsg(channel, s);
                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);
+       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;
                }
-               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':
-               privmsg(&msg[3], p);
-               return;
-       case 's':
-               strncpy(channel, &msg[3], sizeof(channel));
-               return;
-       case 't':
-               snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p);
-               break;
        }
-       write(srv, bufout, strlen(bufout));
+       sout("%s", s);
 }
 
-static unsigned int
-tokenize(char **result, unsigned int reslen, char *str, char delim)
-{
-       char *p, *n;
-       unsigned int i = 0;
+static void
+parsesrv(char *cmd) {
+       char *usr, *par, *txt;
 
-       if(!str)
-               return 0;
-       for(n = str; *n == delim; n++);
-       p = n;
-       for(i = 0; *n != 0;) {
-               if(i == reslen)
-                       return i;
-               if(*n == delim) {
-                       *n = 0;
-                       if(strlen(p))
-                               result[i++] = p;
-                       p = ++n;
-               } else
-                       n++;
+       usr = host;
+       if(!cmd || !*cmd)
+               return;
+       if(cmd[0] == ':') {
+               usr = cmd + 1;
+               cmd = skip(usr, ' ');
+               if(cmd[0] == '\0')
+                       return;
+               skip(usr, '!');
        }
-       if((i < reslen) && (p < n) && strlen(p))
-               result[i++] = p;
-       return i;       /* number of tokens */
-}
-
-static void
-parsesrv(char *msg)
-{
-       char *argv[Tlast], *cmd, *p;
-       int i;
-       if(!msg || !(*msg))
+       skip(cmd, '\r');
+       par = skip(cmd, ' ');
+       txt = skip(par, ':');
+       trim(par);
+       if(!strcmp("PONG", cmd))
                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
-        */
-       if(msg[0] == ':') { /* check prefix */
-               p = strchr(msg, ' ');
-               *p = 0;
-               for(++p; *p == ' '; p++);
-               cmd = p;
-               argv[Tnick] = &msg[1];
-               if((p = strchr(msg, '!'))) {
-                       *p = 0;
-                       argv[Tuser] = ++p;
-               }
-       } 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;
+       if(!strcmp("PRIVMSG", cmd))
+               pout(par, "<%s> %s", usr, txt);
+       else if(!strcmp("PING", cmd))
+               sout("PONG %s", txt);
+       else {
+               pout(usr, ">< %s (%s): %s", cmd, par, txt);
+               if(!strcmp("NICK", cmd) && !strcmp(usr, nick))
+                       strlcpy(nick, txt, sizeof nick);
        }
-       tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
+}
 
-       if(!strncmp("PONG", argv[Tcmd], 5)) {
-               return;
-       } 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 */
-               snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : "");
-               pout(server, bufout);
-               return;
-       } 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)) {
-               if(argv[Ttext]!=NULL){
-                       p = strchr(argv[Ttext], ' ');
-               if(p)
-                       *p = 0;
-               }
-               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)) {
-               snprintf(bufout, sizeof(bufout), "-!- %s(%s) has left %s",
-                               argv[Tnick], argv[Tuser], argv[Tchan]);
-       } 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]);
-       else if(!strncmp("QUIT", argv[Tcmd], 5))
-               snprintf(bufout, sizeof(bufout), "-!- %s(%s) has quit \"%s\"",
-                               argv[Tnick], argv[Tuser],
-                               argv[Ttext] ? argv[Ttext] : "");
-       else if(!strncmp("NICK", argv[Tcmd], 5))
-               snprintf(bufout, sizeof(bufout), "-!- %s changed nick to %s",
-                               argv[Tnick], argv[Ttext]);
-       else if(!strncmp("TOPIC", argv[Tcmd], 6))
-               snprintf(bufout, sizeof(bufout), "-!- %s changed topic to \"%s\"",
-                               argv[Tnick], argv[Ttext] ? argv[Ttext] : "");
-       else if(!strncmp("KICK", argv[Tcmd], 5))
-               snprintf(bufout, sizeof(bufout), "-!- %s kicked %s (\"%s\")",
-                               argv[Tnick], argv[Targ],
-                               argv[Ttext] ? argv[Ttext] : "");
-       else if(!strncmp("NOTICE", argv[Tcmd], 7))
-               snprintf(bufout, sizeof(bufout), "-!- \"%s\")",
-                               argv[Ttext] ? argv[Ttext] : "");
-       else if(!strncmp("PRIVMSG", argv[Tcmd], 8)) 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);
-       else
-               pout(argv[Tchan], bufout);
+
+static void
+usage(void) {
+       eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n", argv0);
 }
 
 int
-main(int argc, char *argv[])
-{
-       int i;
+main(int argc, char *argv[]) {
        struct timeval tv;
-       struct hostent *hp;
-       struct sockaddr_in addr = { 0 };
-       char ping[256];
+       const char *user = getenv("USER");
+       int n;
        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':
-                       server = argv[i++];
-                       break;
-               case 'p':
-                       port = atoi(argv[i++]);
-                       break;
-               case 'n':
-                       nick = argv[i++];
-                       break;
-               case 'k':
-                       password = argv[i++];
-                       break;
-               case 'f':
-                       fullname = argv[i++];
-                       break;
-               case 'v':
-                       fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-                       exit(EXIT_SUCCESS);
-                       break;
-               }
-       }
+       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 */
-       if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-               fprintf(stderr, "sic: cannot connect server '%s'\n", server);
-               exit(EXIT_FAILURE);
-       }
-       hp = gethostbyname(server);
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(port);
-       bcopy(hp->h_addr, &addr.sin_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);
-       }
-
+       srv = fdopen(dial(host, port), "r+");
+       if (!srv)
+               eprint("fdopen:");
        /* login */
        if(password)
-               snprintf(bufout, sizeof(bufout),
-                               "PASS %s\r\nNICK %s\r\nUSER %s localserver %s :%s\r\n",
-                               password, nick, nick, server, fullname ? fullname : nick);
-       else
-               snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localserver %s :%s\r\n",
-                                nick, nick, server, fullname ? fullname : nick);
-       write(srv, bufout, strlen(bufout));
-
-       snprintf(ping, sizeof(ping), "PING %s\r\n", server);
-       channel[0] = 0;
-       setbuf(stdout, NULL); /* unbuffered stdout */
-       for(;;) {
+               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;
-                       perror("sic: error on select()");
-                       exit(EXIT_FAILURE);
-               } else if(i == 0) {
-                       if(time(NULL) - trespond >= PINGTIMEOUT) {
-                               pout(server, "-!- sic shutting down: parseing timeout");
-                               exit(EXIT_FAILURE);
-                       }
-                       write(srv, ping, strlen(ping));
+                       eprint("sic: error on select():");
+               }
+               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)) {
-                       if(getline(srv, sizeof(bufin), bufin) == -1) {
-                               perror("sic: remote server closed connection");
-                               exit(EXIT_FAILURE);
-                       }
+               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)) {
-                       if(getline(0, sizeof(bufin), bufin) == -1) {
-                               perror("sic: broken pipe");
-                               exit(EXIT_FAILURE);
-                       }
+                       if(fgets(bufin, sizeof bufin, stdin) == NULL)
+                               eprint("sic: broken pipe\n");
                        parsein(bufin);
                }
        }
-
        return 0;
 }