X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=8d6580918df69c13a3395d71654876350af4e4c5;hb=c2fcf48e6d334234859c5e015ec6cc816bca451b;hp=5e06962c64dedcfc6b7d51047d30e26a5bbb1a83;hpb=03aa190e8285ca90615981ce5afff41b8892a316;p=sic.git diff --git a/sic.c b/sic.c index 5e06962..8d65809 100644 --- a/sic.c +++ b/sic.c @@ -10,21 +10,21 @@ #include #include #include -#include #include +#include +#include +#include #define PINGTIMEOUT 300 #define MAXMSG 4096 enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast }; -/* CUSTOMIZE */ -static const char *ping = "PING irc.oftc.net\r\n"; -static const char *host = "irc.oftc.net"; -static const int port = 6667; -static const char *nick = "arg"; -static const char *fullname = "Anselm R. Garbe"; -static const char *password = NULL; +static char *server = "irc.oftc.net"; +static unsigned short port = 6667; +static char *nick = NULL; +static char *fullname = NULL; +static char *password = NULL; static char bufin[MAXMSG], bufout[MAXMSG]; static char channel[256]; @@ -53,7 +53,7 @@ pout(char *channel, char *msg) time_t t = time(0); strftime(timestr, sizeof(timestr), "%a %R", localtime(&t)); - fprintf(stdout, "%s: %s %s\n", channel, timestr, msg); + fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg); } static void @@ -70,6 +70,8 @@ parsein(char *msg) { char *p; + if(msg[0] == 0) + return; if(msg[0] != '/') { privmsg(channel, msg); return; @@ -77,6 +79,9 @@ parsein(char *msg) 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]); @@ -93,17 +98,13 @@ parsein(char *msg) break; case 'm': privmsg(&msg[3], p); - break; + return; case 's': strncpy(channel, &msg[3], sizeof(channel)); return; - break; case 't': snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p); break; - default: - snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]); - break; } write(srv, bufout, strlen(bufout)); } @@ -147,7 +148,7 @@ parsesrv(char *msg) /* ::= [':' ] - ::= | [ '!' ] [ '@' ] + ::= | [ '!' ] [ '@' ] ::= { } | ::= ' ' { ' ' } ::= [ ':' | ] @@ -188,7 +189,7 @@ parsesrv(char *msg) return; } else if(!argv[Tnick] || !argv[Tuser]) { /* server command */ snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : ""); - pout((char *)host, bufout); + pout(server, bufout); return; } else if(!strncmp("ERROR", argv[Tcmd], 6)) snprintf(bufout, sizeof(bufout), "-!- error %s", @@ -226,7 +227,8 @@ parsesrv(char *msg) 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", + 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); @@ -240,15 +242,33 @@ 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 [-v]\n", stderr); + 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 = (unsigned short)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); @@ -258,16 +278,19 @@ main(int argc, char *argv[]) /* init */ if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "sic: cannot connect server '%s'\n", host); + fprintf(stderr, "sic: cannot connect server '%s'\n", server); + exit(EXIT_FAILURE); + } + if (NULL == (hp = gethostbyname(server))) { + fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server); exit(EXIT_FAILURE); } - hp = gethostbyname(host); 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", host); + fprintf(stderr, "sic: cannot connect server '%s'\n", server); exit(EXIT_FAILURE); } @@ -275,12 +298,13 @@ 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, host, 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, host, fullname ? fullname : nick); + 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(;;) { @@ -297,7 +321,7 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } else if(i == 0) { if(time(NULL) - trespond >= PINGTIMEOUT) { - pout((char *)host, "-!- sic shutting down: parseing timeout"); + pout(server, "-!- sic shutting down: parseing timeout"); exit(EXIT_FAILURE); } write(srv, ping, strlen(ping)); @@ -305,7 +329,7 @@ main(int argc, char *argv[]) } if(FD_ISSET(srv, &rd)) { if(getline(srv, sizeof(bufin), bufin) == -1) { - perror("sic: remote host closed connection"); + perror("sic: remote server closed connection"); exit(EXIT_FAILURE); } parsesrv(bufin);