From 210b722f843b88d500ee7a0c124804e955b82e7d Mon Sep 17 00:00:00 2001
From: Klemens Nanni <kl3@posteo.org>
Date: Sun, 3 Apr 2016 00:17:06 +0200
Subject: [PATCH 2/7] Use line breaks, indent properly

This makes the code more readable.
---
 ii.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 23 deletions(-)

diff --git a/ii.c b/ii.c
index b96f63b..8b5e44e 100644
--- a/ii.c
+++ b/ii.c
@@ -54,7 +54,8 @@ static void usage() {
 static char *striplower(char *s) {
 	char *p = NULL;
 	for (p = s; p && *p; p++) {
-		if (*p == '/') *p = ',';
+		if (*p == '/')
+			*p = ',';
 		*p = tolower(*p);
 	}
 	return s;
@@ -133,7 +134,8 @@ static void add_channel(char *cname) {
 
 static void rm_channel(Channel *c) {
 	Channel *p;
-	if (channels == c) channels = channels->next;
+	if (channels == c)
+		channels = channels->next;
 	else {
 		for (p = channels; p && p->next != c; p = p->next);
 		if (p->next == c)
@@ -144,10 +146,13 @@ static void rm_channel(Channel *c) {
 }
 
 static void login(char *key, char *fullname) {
-	if (key) snprintf(message, PIPE_BUF,
+	if (key)
+		snprintf(message, PIPE_BUF,
 				"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n", key,
 				nick, nick, host, fullname ? fullname : nick);
-	else snprintf(message, PIPE_BUF, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
+	else
+		snprintf(message, PIPE_BUF,
+				"NICK %s\r\nUSER %s localhost %s :%s\r\n",
 				nick, nick, host, fullname ? fullname : nick);
 	write(irc, message, strlen(message));	/* login */
 }
@@ -183,7 +188,7 @@ static size_t tokenize(char **result, size_t reslen, char *str, char delim) {
 	if (!str)
 		return 0;
 	for (n = str; *n == ' '; n++);
-	p = n;
+		p = n;
 	for (i = 0; *n != 0;) {
 		if (i == reslen)
 			return 0;
@@ -205,11 +210,15 @@ static void print_out(char *channel, char *buf) {
 	FILE *out = NULL;
 	time_t t = time(0);
 
-	if (channel) snprintf(server, sizeof(server), "-!- %s", channel);
-	if (strstr(buf, server)) channel="";
+	if (channel)
+		snprintf(server, sizeof(server), "-!- %s", channel);
+	if (strstr(buf, server))
+		channel="";
 	create_filepath(outfile, sizeof(outfile), channel, "out");
-	if (!(out = fopen(outfile, "a"))) return;
-	if (channel && channel[0]) add_channel(channel);
+	if (!(out = fopen(outfile, "a")))
+		return;
+	if (channel && channel[0])
+		add_channel(channel);
 
 	strftime(buft, sizeof(buft), "%F %R", localtime(&t));
 	fprintf(out, "%s %s\n", buft, buf);
@@ -235,10 +244,13 @@ static void proc_channels_input(Channel *c, char *buf) {
 	if (buf[2] == ' ' || buf[2] == '\0') switch (buf[1]) {
 		case 'j':
 			p = strchr(&buf[3], ' ');
-			if (p) *p = 0;
+			if (p)
+				*p = 0;
 			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]);
+				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) {
@@ -313,10 +325,11 @@ static void proc_server_cmd(char *buf) {
 	   <crlf>     ::= CR LF */
 
 	if (buf[0] == ':') {		/* check prefix */
-		if (!(p = strchr(buf, ' '))) return;
+		if (!(p = strchr(buf, ' ')))
+			return;
 		*p = 0;
 		for (++p; *p == ' '; p++);
-		cmd = p;
+			cmd = p;
 		argv[TOK_NICKSRV] = &buf[1];
 		if ((p = strchr(buf, '!'))) {
 			*p = 0;
@@ -391,7 +404,7 @@ static int read_line(int fd, size_t res_len, char *buf) {
 		buf[i++] = c;
 	}
 	while (c != '\n' && i < res_len);
-	buf[i - 1] = 0;			/* eliminates '\n' */
+		buf[i - 1] = 0;		/* eliminates '\n' */
 	return 0;
 }
 
@@ -477,17 +490,32 @@ int main(int argc, char *argv[]) {
 	}
 	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();
+	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]) {
-			case 'i': snprintf(prefix,sizeof(prefix),"%s", argv[++i]); break;
-			case 's': host = argv[++i]; break;
-			case 'p': port = strtol(argv[++i], NULL, 10); break;
-			case 'n': snprintf(nick,sizeof(nick),"%s", argv[++i]); break;
-			case 'k': key = getenv(argv[++i]); break;
-			case 'f': fullname = argv[++i]; break;
-			default: usage(); break;
+			case 'i':
+				snprintf(prefix,sizeof(prefix),"%s", argv[++i]);
+				break;
+			case 's':
+				host = argv[++i];
+				break;
+			case 'p':
+				port = strtol(argv[++i], NULL, 10);
+				break;
+			case 'n':
+				snprintf(nick,sizeof(nick),"%s", argv[++i]);
+				break;
+			case 'k':
+				key = getenv(argv[++i]);
+				break;
+			case 'f':
+				fullname = argv[++i];
+				break;
+			default:
+				usage();
+				break;
 		}
 	}
 	irc = tcpopen(port);
-- 
2.8.0