iiiypuk/sic
iiiypuk/sic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code polishing, removed useless crap

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-10-09 07:20:07 +02:00
parent 83e05870ce
commit 3a24553892
1 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
sic.c
View File

@ -1,9 +1,7 @@
/* /* (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
* (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
* (C)opyright MMV-MMVI Nico Golde <nico at ngolde dot de> * (C)opyright MMV-MMVI Nico Golde <nico at ngolde dot de>
* See LICENSE file for license details. * See LICENSE file for license details.
*/ */
#include <errno.h> #include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -32,10 +30,10 @@ static int srv;
static time_t trespond; static time_t trespond;
static int static int
getline(int fd, unsigned int len, char *buf) getline(int fd, unsigned int len, char *buf) {
{
unsigned int i = 0; unsigned int i = 0;
char c; char c;
do { do {
if(read(fd, &c, sizeof(char)) != sizeof(char)) if(read(fd, &c, sizeof(char)) != sizeof(char))
return -1; return -1;
@ -47,8 +45,7 @@ getline(int fd, unsigned int len, char *buf)
} }
static void static void
pout(char *channel, char *msg) pout(char *channel, char *msg) {
{
static char timestr[18]; static char timestr[18];
time_t t = time(0); time_t t = time(0);
@ -57,8 +54,7 @@ pout(char *channel, char *msg)
} }
static void static void
privmsg(char *channel, char *msg) privmsg(char *channel, char *msg) {
{
snprintf(bufout, sizeof(bufout), "<%s> %s", nick, msg); snprintf(bufout, sizeof(bufout), "<%s> %s", nick, msg);
pout(channel, bufout); 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);
@ -66,8 +62,7 @@ privmsg(char *channel, char *msg)
} }
static void static void
parsein(char *msg) parsein(char *msg) {
{
char *p; char *p;
if(msg[0] == 0) if(msg[0] == 0)
@ -101,8 +96,7 @@ parsein(char *msg)
} }
static unsigned int static unsigned int
tokenize(char **result, unsigned int reslen, char *str, char delim) tokenize(char **result, unsigned int reslen, char *str, char delim) {
{
char *p, *n; char *p, *n;
unsigned int i = 0; unsigned int i = 0;
@ -127,26 +121,25 @@ tokenize(char **result, unsigned int reslen, char *str, char delim)
} }
static void static void
parsesrv(char *msg) parsesrv(char *msg) {
{
char *argv[Tlast], *cmd, *p; char *argv[Tlast], *cmd, *p;
int i; int i;
if(!msg || !(*msg)) if(!msg || !(*msg))
return; return;
for(i = 0; i < Tlast; i++) for(i = 0; i < Tlast; i++)
argv[i] = NULL; argv[i] = NULL;
/* /* <bufout> ::= [':' <prefix> <SPACE> ] <command> <params> <crlf>
<bufout> ::= [':' <prefix> <SPACE> ] <command> <params> <crlf> * <prefix> ::= <servername> | <nick> [ '!' <user> ] [ '@' <server> ]
<prefix> ::= <servername> | <nick> [ '!' <user> ] [ '@' <server> ] * <command> ::= <letter> { <letter> } | <number> <number> <number>
<command> ::= <letter> { <letter> } | <number> <number> <number> * <SPACE> ::= ' ' { ' ' }
<SPACE> ::= ' ' { ' ' } * <params> ::= <SPACE> [ ':' <trailing> | <middle> <params> ]
<params> ::= <SPACE> [ ':' <trailing> | <middle> <params> ] * <middle> ::= <Any *non-empty* sequence of octets not including SPACE
<middle> ::= <Any *non-empty* sequence of octets not including SPACE * or NUL or CR or LF, the first of which may not be ':'>
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>
<trailing> ::= <Any, possibly *empty*, sequence of octets not including NUL or CR or LF> * <crlf> ::= CR LF
<crlf> ::= CR LF
*/ */
if(msg[0] == ':') { /* check prefix */ if(msg[0] == ':') { /* check prefix */
p = strchr(msg, ' '); p = strchr(msg, ' ');
@ -160,29 +153,28 @@ parsesrv(char *msg)
} }
} else } else
cmd = msg; cmd = msg;
/* remove CRLFs */ /* remove CRLFs */
for(p = cmd; p && *p != 0; p++) for(p = cmd; p && *p != 0; p++)
if(*p == '\r' || *p == '\n') if(*p == '\r' || *p == '\n')
*p = 0; *p = 0;
if((p = strchr(cmd, ':'))) { if((p = strchr(cmd, ':'))) {
*p = 0; *p = 0;
argv[Ttext] = ++p; argv[Ttext] = ++p;
} }
tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' '); tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
if(!strncmp("PONG", argv[Tcmd], 5))
if(!strncmp("PONG", argv[Tcmd], 5)) {
return; return;
} else if(!strncmp("PING", argv[Tcmd], 5)) { else if(!strncmp("PING", argv[Tcmd], 5)) {
snprintf(bufout, sizeof(bufout), "PONG %s\r\n", argv[Ttext]); snprintf(bufout, sizeof(bufout), "PONG %s\r\n", argv[Ttext]);
write(srv, bufout, strlen(bufout)); write(srv, bufout, strlen(bufout));
return; return;
} else if(!argv[Tnick] || !argv[Tuser]) { /* server command */ }
else if(!argv[Tnick] || !argv[Tuser]) { /* server command */
snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : ""); snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : "");
pout(server, bufout); pout(server, bufout);
return; return;
} else if(!strncmp("ERROR", argv[Tcmd], 6)) }
else if(!strncmp("ERROR", argv[Tcmd], 6))
snprintf(bufout, sizeof(bufout), "-!- error %s", snprintf(bufout, sizeof(bufout), "-!- error %s",
argv[Ttext] ? argv[Ttext] : "unknown"); argv[Ttext] ? argv[Ttext] : "unknown");
else if(!strncmp("JOIN", argv[Tcmd], 5)) { else if(!strncmp("JOIN", argv[Tcmd], 5)) {
@ -194,10 +186,12 @@ parsesrv(char *msg)
argv[Tchan] = argv[Ttext]; argv[Tchan] = argv[Ttext];
snprintf(bufout, sizeof(bufout), "-!- %s(%s) has joined %s", snprintf(bufout, sizeof(bufout), "-!- %s(%s) has joined %s",
argv[Tnick], argv[Tuser], argv[Ttext]); argv[Tnick], argv[Tuser], argv[Ttext]);
} else if(!strncmp("PART", argv[Tcmd], 5)) { }
else if(!strncmp("PART", argv[Tcmd], 5)) {
snprintf(bufout, sizeof(bufout), "-!- %s(%s) has left %s", snprintf(bufout, sizeof(bufout), "-!- %s(%s) has left %s",
argv[Tnick], argv[Tuser], argv[Tchan]); argv[Tnick], argv[Tuser], argv[Tchan]);
} else if(!strncmp("MODE", argv[Tcmd], 5)) }
else if(!strncmp("MODE", argv[Tcmd], 5))
snprintf(bufout, sizeof(bufout), "-!- %s changed mode/%s -> %s %s", snprintf(bufout, sizeof(bufout), "-!- %s changed mode/%s -> %s %s",
argv[Tnick], argv[Tcmd + 1], argv[Tnick], argv[Tcmd + 1],
argv[Tcmd + 2], argv[Tcmd + 3]); argv[Tcmd + 2], argv[Tcmd + 3]);
@ -228,8 +222,7 @@ parsesrv(char *msg)
} }
int int
main(int argc, char *argv[]) main(int argc, char *argv[]) {
{
int i; int i;
struct timeval tv; struct timeval tv;
struct hostent *hp; struct hostent *hp;
@ -238,7 +231,7 @@ main(int argc, char *argv[])
fd_set rd; fd_set rd;
nick = fullname = getenv("USER"); nick = fullname = getenv("USER");
for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { for(i = 1; (i < argc) && (argv[i][0] == '-'); i++)
switch (argv[i][1]) { switch (argv[i][1]) {
default: default:
fputs("usage: sic [-s server] [-p port] [-n nick]" fputs("usage: sic [-s server] [-p port] [-n nick]"
@ -265,7 +258,6 @@ main(int argc, char *argv[])
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
} }
}
/* init */ /* init */
if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) { if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@ -284,7 +276,6 @@ main(int argc, char *argv[])
fprintf(stderr, "sic: cannot connect server '%s'\n", server); fprintf(stderr, "sic: cannot connect server '%s'\n", server);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* login */ /* login */
if(password) if(password)
snprintf(bufout, sizeof(bufout), snprintf(bufout, sizeof(bufout),
@ -294,11 +285,11 @@ main(int argc, char *argv[])
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); nick, nick, server, fullname);
write(srv, bufout, strlen(bufout)); 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; channel[0] = 0;
setbuf(stdout, NULL); /* unbuffered stdout */ setbuf(stdout, NULL); /* unbuffered stdout */
for(;;) {
for(;;) { /* main loop */
FD_ZERO(&rd); FD_ZERO(&rd);
FD_SET(0, &rd); FD_SET(0, &rd);
FD_SET(srv, &rd); FD_SET(srv, &rd);
@ -334,6 +325,5 @@ main(int argc, char *argv[])
parsein(bufin); parsein(bufin);
} }
} }
return 0; return 0;
} }