#define PINGTIMEOUT 300
#define MAXMSG 4096
-enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
-
static char *server = "irc.oftc.net";
static unsigned short port = 6667;
static char *nick = NULL;
static char timestr[18];
time_t t = time(0);
- strftime(timestr, sizeof(timestr), "%F %R", localtime(&t));
+ strftime(timestr, sizeof timestr, "%F %R", localtime(&t));
fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg);
}
static void
privmsg(char *channel, char *msg) {
- snprintf(bufout, sizeof(bufout), "<%s> %s", nick, msg);
+ if(channel[0] == 0)
+ return;
+ snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg);
pout(channel, bufout);
- snprintf(bufout, sizeof(bufout), "PRIVMSG %s :%s\r\n", channel, msg);
+ snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg);
write(srv, bufout, strlen(bufout));
}
if(msg[0] == 0)
return;
- if(msg[0] != '/') {
+ if(msg[0] != ':') {
privmsg(channel, 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\r\n", &msg[3]);
+ snprintf(bufout, sizeof bufout, "PART %s :sic - 300 LOC are too much!\r\n", &msg[3]);
else if(!strncmp(msg + 1, "m ", 2)) {
if((p = strchr(&msg[3], ' ')))
*(p++) = 0;
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);
+ 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));
}
-static unsigned int
-tokenize(char **result, unsigned int reslen, char *str, char delim) {
- char *p, *n;
- unsigned int i = 0;
-
- 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++;
- }
- 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;
+ char *chan, *cmd, *p, *txt, *usr;
if(!msg || !(*msg))
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, ' ');
+ if(!(p = strchr(msg, ' ')))
+ return;
*p = 0;
- for(++p; *p == ' '; p++);
- cmd = p;
- argv[Tnick] = &msg[1];
- if((p = strchr(msg, '!'))) {
+ usr = &msg[1];
+ cmd = ++p;
+ if((p = strchr(usr, '!')))
*p = 0;
- argv[Tuser] = ++p;
- }
} else
cmd = msg;
/* remove CRLFs */
- for(p = cmd; p && *p != 0; p++)
+ for(p = cmd; *p; p++)
if(*p == '\r' || *p == '\n')
*p = 0;
- if((p = strchr(cmd, ':'))) {
- *p = 0;
- argv[Ttext] = ++p;
- }
- tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
- if(!strncmp("PONG", argv[Tcmd], 5))
+ if(!strncmp("PONG", cmd, 4))
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;
+ if(!strncmp("PRIVMSG", cmd, 7) || !strncmp("PING", cmd, 4)) {
+ if(!(p = strchr(cmd, ' ')))
+ return;
+ *p = 0;
+ chan = ++p;
+ for(; *p && *p != ' '; p++);
+ *p = 0;
+ if(!(p = strchr(++p, ':')))
+ return;
+ *p = 0;
+ txt = ++p;
+ if(!strncmp("PRIVMSG", cmd, 8) && chan && txt) {
+ snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt);
+ pout(chan, bufout);
}
- 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("PING", cmd, 5) && txt) {
+ snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt);
+ write(srv, bufout, strlen(bufout));
+ }
+ return;
}
- 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);
+ snprintf(bufout, sizeof bufout, "-!- %s", cmd);
+ pout(server, bufout);
}
int
}
/* login */
if(password)
- snprintf(bufout, sizeof(bufout),
+ snprintf(bufout, sizeof bufout,
"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
password, nick, nick, server, fullname);
else
- snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localhost %s :%s\r\n",
+ snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
nick, nick, server, fullname);
write(srv, bufout, strlen(bufout));
- snprintf(ping, sizeof(ping), "PING %s\r\n", server);
+ snprintf(ping, sizeof ping, "PING %s\r\n", server);
channel[0] = 0;
setbuf(stdout, NULL); /* unbuffered stdout */
continue;
}
if(FD_ISSET(srv, &rd)) {
- if(getline(srv, sizeof(bufin), bufin) == -1) {
+ if(getline(srv, sizeof bufin, bufin) == -1) {
perror("sic: remote server closed connection");
exit(EXIT_FAILURE);
}
trespond = time(NULL);
}
if(FD_ISSET(0, &rd)) {
- if(getline(0, sizeof(bufin), bufin) == -1) {
+ if(getline(0, sizeof bufin, bufin) == -1) {
perror("sic: broken pipe");
exit(EXIT_FAILURE);
}
projects / sic.git / blobdiff