#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/socket.h>
#include <time.h>
+#include <sys/socket.h>
+#include <sys/time.h>
#define PINGTIMEOUT 300
#define MAXMSG 4096
enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
-/* CUSTOMIZE */
static char *server = "irc.oftc.net";
static int port = 6667;
static char *nick = NULL;
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
{
char *p;
+ if(msg[0] == 0)
+ return;
if(msg[0] != '/') {
privmsg(channel, msg);
return;
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);
exit(EXIT_FAILURE);
break;
case 's':
- server = argv[i++];
+ server = argv[++i];
break;
case 'p':
- port = atoi(argv[i++]);
+ port = atoi(argv[++i]);
break;
case 'n':
- nick = argv[i++];
+ nick = argv[++i];
break;
case 'k':
- password = argv[i++];
+ password = argv[++i];
break;
case 'f':
- fullname = argv[i++];
+ fullname = argv[++i];
break;
case 'v':
fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
/* 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);
+ "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 localserver %s :%s\r\n",
- nick, nick, server, fullname ? fullname : nick);
+ 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);