diff -r 1b2227123889 ii.c
--- a/ii.c	Mon Jan 31 21:47:02 2011 +0100
+++ b/ii.c	Wed Oct 12 12:04:48 2011 -0700
@@ -121,13 +121,10 @@
 		perror("ii: cannot allocate memory");
 		exit(EXIT_FAILURE);
 	}
-	if(!channels) channels = c;
-	else {
-		c->next = channels;
-		channels = c;
-	}
 	c->fd = fd;
 	c->name = strdup(name);
+	c->next = channels;
+	channels = c;
 }
 
 static void rm_channel(Channel *c) {
@@ -223,10 +220,12 @@
 }
 
 static void proc_channels_input(Channel *c, char *buf) {
-	/* static char infile[256]; */
+	static char infile[256];
 	char *p = NULL;
 
-	if(buf[0] != '/' && buf[0] != 0) {
+	if(buf[0] == '\0')
+		return;
+	if(buf[0] != '/') {
 		proc_channels_privmsg(c->name, buf);
 		return;
 	}
@@ -235,17 +234,14 @@
 		case 'j':
 			p = strchr(&buf[3], ' ');
 			if(p) *p = 0;
+			add_channel(&buf[3]);
 			if((buf[3]=='#')||(buf[3]=='&')||(buf[3]=='+')||(buf[3]=='!')){
 				if(p) snprintf(message, PIPE_BUF, "JOIN %s %s\r\n", &buf[3], p + 1); /* password protected channel */
 				else snprintf(message, PIPE_BUF, "JOIN %s\r\n", &buf[3]);
-				add_channel(&buf[3]);
 			}
-			else {
-				if(p){
-					add_channel(&buf[3]);
-					proc_channels_privmsg(&buf[3], p + 1);
-					return;
-				}
+			else if(p){
+				proc_channels_privmsg(&buf[3], p + 1);
+				return;
 			}
 			break;
 		case 't':
@@ -275,10 +271,11 @@
 			else
 				snprintf(message, PIPE_BUF,
 						"PART %s :ii - 500 SLOC are too much\r\n", c->name);
-			write(irc, message, strlen(message));
+			if((c->name[0]=='#')||(c->name[0]=='&')||(c->name[0]=='+')||(c->name[0]=='!'))
+				write(irc, message, strlen(message));
 			close(c->fd);
-			/*create_filepath(infile, sizeof(infile), c->name, "in");
-			unlink(infile); */
+			create_filepath(infile, sizeof(infile), c->name, "in");
+			unlink(infile);
 			rm_channel(c);
 			return;
 			break;
@@ -344,7 +341,7 @@
 		write(irc, message, strlen(message));
 		return;
 	} else if(!argv[TOK_NICKSRV] || !argv[TOK_USER]) {	/* server command */
-		snprintf(message, PIPE_BUF, "%s%s", argv[TOK_ARG] ? argv[TOK_ARG] : "", argv[TOK_TEXT] ? argv[TOK_TEXT] : "");
+		snprintf(message, PIPE_BUF, "<%s> %s%s", host, argv[TOK_ARG] ? argv[TOK_ARG] : "", argv[TOK_TEXT] ? argv[TOK_TEXT] : "");
 		print_out(0, message);
 		return;
 	} else if(!strncmp("ERROR", argv[TOK_CMD], 6))
@@ -358,6 +355,8 @@
 		argv[TOK_CHAN] = argv[TOK_TEXT];
 		snprintf(message, PIPE_BUF, "-!- %s(%s) has joined %s", argv[TOK_NICKSRV], argv[TOK_USER], argv[TOK_TEXT]);
 	} else if(!strncmp("PART", argv[TOK_CMD], 5)) {
+		if(!strncmp(nick, argv[TOK_NICKSRV], sizeof(nick)))
+			return;
 		snprintf(message, PIPE_BUF, "-!- %s(%s) has left %s", argv[TOK_NICKSRV], argv[TOK_USER], argv[TOK_CHAN]);
 	} else if(!strncmp("MODE", argv[TOK_CMD], 5))
 		snprintf(message, PIPE_BUF, "-!- %s changed mode/%s -> %s %s", argv[TOK_NICKSRV], argv[TOK_CMD + 1] ? argv[TOK_CMD + 1] : "" , argv[TOK_CMD + 2]? argv[TOK_CMD + 2] : "", argv[TOK_CMD + 3] ? argv[TOK_CMD + 3] : "");
@@ -472,7 +471,6 @@
 	}
 	snprintf(nick, sizeof(nick), "%s", spw->pw_name);
 	snprintf(prefix, sizeof(prefix),"%s/irc", spw->pw_dir);
-	if (argc <= 1 || (argc == 2 && argv[1][0] == '-' && argv[1][1] == 'h')) usage();
 
 	for(i = 1; (i + 1 < argc) && (argv[i][0] == '-'); i++) {
 		switch (argv[i][1]) {
@@ -485,6 +483,7 @@
 			default: usage(); break;
 		}
 	}
+	if(i != argc) usage();
 	irc = tcpopen(port);
 	if(!snprintf(path, sizeof(path), "%s/%s", prefix, host)) {
 		fprintf(stderr, "%s", "ii: path to irc directory too long\n");