#include <errno.h>
#include <netdb.h>
#include <netinet/in.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
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;
static char timestr[18];
time_t t = time(0);
- strftime(timestr, sizeof timestr, "%F %R", localtime(&t));
- fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg);
+ strftime(timestr, sizeof timestr, "%D %R", localtime(&t));
+ fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, msg);
}
static void
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], ' ')))
+ if((p = strchr(msg + 3, ' ')))
*(p++) = 0;
- snprintf(bufout, sizeof bufout, "TOPIC %s :%s\r\n", &msg[3], p);
+ 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));
}
parsesrv(char *msg) {
char *chan, *cmd, *p, *txt, *usr;
+ txt = NULL;
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];
+ usr = msg + 1;
*p = 0;
cmd = ++p;
if((p = strchr(usr, '!')))
*p = 0;
- /* remove CRLFs */
- if(!(p = strchr(cmd, ':')))
- return;
- *p = 0;
- txt = ++p;
- for(p = txt; *p; p++)
+ for(p = cmd; *p; p++) /* remove CRLFs */
if(*p == '\r' || *p == '\n')
*p = 0;
+ if((p = strchr(cmd, ':'))) {
+ *p = 0;
+ txt = ++p;
+ }
if(!strncmp("PONG", cmd, 4))
return;
- if(!strncmp("PRIVMSG", cmd, 7)) {
+ if(!strncmp("PRIVMSG", cmd, 7) && txt) {
if(!(p = strchr(cmd, ' ')))
return;
*p = 0;
write(srv, bufout, strlen(bufout));
}
else {
- snprintf(bufout, sizeof bufout, "-!- %s", cmd);
+ 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);
}
}
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];
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;
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);
}
}
projects / sic.git / blobdiff