Commit Diff


commit - 3e0dfc1698580979b40e0c5604db07e59b63b0e3
commit + a3ace556e41271fcdec9ed53401171618bd2b142
blob - f8c2979e4454e7732224d76dbf06aef9a969073e
blob + ebc761247f78ab664a591786033015e1199b42ce
--- icb.c
+++ icb.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -328,7 +329,7 @@ icb_cmd(const char *cmd, unsigned char len, int fd, in
 		break;
 	case 'g':	/* Exit */
 		irc_send_notice(fd, "ICB Exit");
-		printf("server Exit\n");
+		warnx("server Exit\n");
 		terminate_client = 1;
 		break;
 	case 'i':	/* Command Output */
blob - 8ab30e92c3f3da6c288b5ae91236681197a2d685
blob + f5c679be798f6b9f38fe35cce46877181ce6d9dc
--- irc.c
+++ irc.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include <err.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -161,7 +162,7 @@ irc_cmd(char *cmd, int client_fd, int server_fd)
 			icb_send_names(server_fd, irc_channel);
 		else {
 			if (strcmp(argv[2], "+o")) {
-				printf("irc_cmd: invalid MODE args '%s'\n",
+				warnx("irc_cmd: invalid MODE args '%s'\n",
 				    argv[2]);
 				return;
 			}
@@ -169,7 +170,7 @@ irc_cmd(char *cmd, int client_fd, int server_fd)
 		}
 	} else if (!strcasecmp(argv[0], "TOPIC")) {
 		if (strcmp(argv[1], irc_channel)) {
-			printf("irc_cmd: invalid TOPIC channel '%s'\n",
+			warnx("irc_cmd: invalid TOPIC channel '%s'\n",
 			    argv[1]);
 			return;
 		}
@@ -184,7 +185,7 @@ irc_cmd(char *cmd, int client_fd, int server_fd)
 		icb_send_who(server_fd, argv[1]);
 	} else if (!strcasecmp(argv[0], "KICK")) {
 		if (strcmp(argv[1], irc_channel)) {
-			printf("irc_cmd: invalid KICK args '%s'\n", argv[1]);
+			warnx("irc_cmd: invalid KICK args '%s'\n", argv[1]);
 			return;
 		}
 		icb_send_boot(server_fd, argv[2]);
@@ -192,10 +193,10 @@ irc_cmd(char *cmd, int client_fd, int server_fd)
 		icb_send_noop(server_fd);
 		irc_send_pong(client_fd, argv[1]);
 	} else if (!strcasecmp(argv[0], "QUIT")) {
-		printf("client QUIT\n");
+		warnx("client QUIT\n");
 		terminate_client = 1;
 	} else
-		printf("irc_cmd: unknown command '%s'\n", argv[0]);
+		warnx("irc_cmd: unknown command '%s'\n", argv[0]);
 }
 
 void