X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Froutines.c;h=3daaa3da86f06f1ca03565c25103278fec5e2238;hb=HEAD;hp=f82836c301dff920ccca6ababf5ce0185f738412;hpb=2dfd5bee542a9d635e380097e63c307bd6c27d65;p=citadel.git

diff --git a/textclient/routines.c b/textclient/routines.c
index f82836c30..ab9254eb4 100644
--- a/textclient/routines.c
+++ b/textclient/routines.c
@@ -1,16 +1,8 @@
-/*
- * Client-side support functions.
- *
- * Copyright (c) 1987-2016 by the citadel.org team
- *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
+// Client-side support functions.
+//
+// Copyright (c) 1987-2016 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure is subject to the GNU General Public License version 3.
 
 #include "textclient.h"
 
@@ -26,7 +18,7 @@ extern int rc_prompt_control;
 /* Destructive backspace */
 void back(int spaces) {
 	int a;
-	for (a=0; a<spaces; ++a) {
+	for (a = 0; a < spaces; ++a) {
 		scr_putc(8);
 		scr_putc(32);
 		scr_putc(8);
@@ -36,8 +28,7 @@ void back(int spaces) {
 /*
  * Edit a user's Internet email addresses
  */
-void edit_user_internet_email_addresses(CtdlIPC *ipc, char *who)
-{
+void edit_user_internet_email_addresses(CtdlIPC * ipc, char *who) {
 	char buf[SIZ];
 	char *resp = NULL;
 	int num_recs = 0;
@@ -56,10 +47,12 @@ void edit_user_internet_email_addresses(CtdlIPC *ipc, char *who)
 			remove_token(emailaddrs, 0, '\n');
 			if (!IsEmptyStr(buf)) {
 				++num_recs;
-				if (num_recs == 1) recs = malloc(sizeof(char *));
-				else recs = realloc(recs, (sizeof(char *)) * num_recs);
-				recs[num_recs-1] = malloc(strlen(buf) + 1);
-				strcpy(recs[num_recs-1], buf);
+				if (num_recs == 1)
+					recs = malloc(sizeof(char *));
+				else
+					recs = realloc(recs, (sizeof(char *)) * num_recs);
+				recs[num_recs - 1] = malloc(strlen(buf) + 1);
+				strcpy(recs[num_recs - 1], buf);
 			}
 		}
 	}
@@ -70,74 +63,77 @@ void edit_user_internet_email_addresses(CtdlIPC *ipc, char *who)
 		scr_printf("    Internet email addresses for %s\n", who);
 		color(DIM_WHITE);
 		scr_printf("--- --------------------------------------------------\n");
-		for (i=0; i<num_recs; ++i) {
+		for (i = 0; i < num_recs; ++i) {
 			color(DIM_WHITE);
-			scr_printf("%3d ", i+1);
+			scr_printf("%3d ", i + 1);
 			color(BRIGHT_CYAN);
 			scr_printf("%s\n", recs[i]);
 			color(DIM_WHITE);
 		}
 
 		ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
-		switch(ch) {
-			case 'a':
-				newprompt("Enter new email address: ", buf, 50);
-				striplt(buf);
-				if (!IsEmptyStr(buf)) {
-					// FIXME validate the email address (format, our own domain, addr does not belong to another user)
-					++num_recs;
-					if (num_recs == 1) {
-						recs = malloc(sizeof(char *));
-					}
-					else {
-						recs = realloc(recs, (sizeof(char *)) * num_recs);
-					}
-					recs[num_recs-1] = strdup(buf);
-				}
-				modified = 1;
-				break;
-			case 'd':
-				i = intprompt("Delete which address", 1, 1, num_recs) - 1;
-				free(recs[i]);
-				--num_recs;
-				for (j=i; j<num_recs; ++j) {
-					recs[j] = recs[j+1];
+		switch (ch) {
+		case 'a':
+			newprompt("Enter new email address: ", buf, 50);
+			string_trim(buf);
+			if (!IsEmptyStr(buf)) {
+				// FIXME validate the email address (format, our own domain, addr does not belong to another user)
+				++num_recs;
+				if (num_recs == 1) {
+					recs = malloc(sizeof(char *));
 				}
-				modified = 1;
-				break;
-			case 's':
-				r = 1;
-				for (i = 0; i < num_recs; i++)
-					r += 1 + strlen(recs[i]);
-				resp = (char *)calloc(1, r);
-				if (!resp) {
-					scr_printf("Can't save config - out of memory!\n");
-					logoff(ipc, 1);
+				else {
+					recs = realloc(recs, (sizeof(char *)) * num_recs);
 				}
-				if (num_recs) for (i = 0; i < num_recs; i++) {
+				recs[num_recs - 1] = strdup(buf);
+			}
+			modified = 1;
+			break;
+		case 'd':
+			i = intprompt("Delete which address", 1, 1, num_recs) - 1;
+			free(recs[i]);
+			--num_recs;
+			for (j = i; j < num_recs; ++j) {
+				recs[j] = recs[j + 1];
+			}
+			modified = 1;
+			break;
+		case 's':
+			r = 1;
+			for (i = 0; i < num_recs; i++)
+				r += 1 + strlen(recs[i]);
+			resp = (char *) calloc(1, r);
+			if (!resp) {
+				scr_printf("Can't save config - out of memory!\n");
+				logoff(ipc, 1);
+			}
+			if (num_recs)
+				for (i = 0; i < num_recs; i++) {
 					strcat(resp, recs[i]);
 					strcat(resp, "\n");
 				}
-				r = CtdlIPCAideSetEmailAddresses(ipc, who, resp, buf);
-				if (r / 100 != 4) {
-					scr_printf("%s\n", buf);
-				} else {
-					scr_printf("Saved %d addresses.\n", num_recs);
-					modified = 0;
-					quitting = 1;
-				}
-                		free(resp);
-				break;
-			case 'q':
-				quitting = !modified || boolprompt("Quit without saving", 0);
-				break;
-			default:
-				break;
+			r = CtdlIPCAideSetEmailAddresses(ipc, who, resp, buf);
+			if (r / 100 != 4) {
+				scr_printf("%s\n", buf);
+			}
+			else {
+				scr_printf("Saved %d addresses.\n", num_recs);
+				modified = 0;
+				quitting = 1;
+			}
+			free(resp);
+			break;
+		case 'q':
+			quitting = !modified || boolprompt("Quit without saving", 0);
+			break;
+		default:
+			break;
 		}
 	} while (!quitting);
 
 	if (recs != NULL) {
-		for (i=0; i<num_recs; ++i) free(recs[i]);
+		for (i = 0; i < num_recs; ++i)
+			free(recs[i]);
 		free(recs);
 	}
 }
@@ -146,14 +142,13 @@ void edit_user_internet_email_addresses(CtdlIPC *ipc, char *who)
 /*
  * Edit or delete a user (cmd=25 to edit/create, 96 to delete)
  */
-void edituser(CtdlIPC *ipc, int cmd)
-{
+void edituser(CtdlIPC * ipc, int cmd) {
 	char buf[SIZ];
 	char who[USERNAME_SIZE];
 	char newname[USERNAME_SIZE];
 	struct ctdluser *user = NULL;
 	int newnow = 0;
-	int r;				/* IPC response code */
+	int r;			/* IPC response code */
 	int change_name = 0;
 
 	strcpy(newname, "");
@@ -176,7 +171,7 @@ void edituser(CtdlIPC *ipc, int cmd)
 		return;
 	}
 
-	if (cmd == 25) {		// user edit
+	if (cmd == 25) {	// user edit
 
 		/* val_user(ipc, user->fullname, 0); we used to display the vCard here but there's really no need */
 
@@ -184,7 +179,7 @@ void edituser(CtdlIPC *ipc, int cmd)
 			change_name = 1;
 			while (change_name == 1) {
 				if (boolprompt("Change name", 0)) {
-					strprompt("New name", newname, USERNAME_SIZE-1);
+					strprompt("New name", newname, USERNAME_SIZE - 1);
 					r = CtdlIPCRenameUser(ipc, user->fullname, newname, buf);
 					if (r / 100 != 2) {
 						scr_printf("%s\n", buf);
@@ -203,7 +198,7 @@ void edituser(CtdlIPC *ipc, int cmd)
 		if (newnow || boolprompt("Change password", 0)) {
 			strprompt("Password", user->password, -19);
 		}
-	
+
 		user->axlevel = intprompt("Access level", user->axlevel, 0, 6);
 		if (boolprompt("Permission to send Internet mail", (user->flags & US_INTERNET))) {
 			user->flags |= US_INTERNET;
@@ -217,9 +212,7 @@ void edituser(CtdlIPC *ipc, int cmd)
 		else {
 			user->flags |= US_REGIS;
 		}
-		user->timescalled = intprompt("Times called", user->timescalled, 0, INT_MAX);
-		user->posted = intprompt("Messages posted", user->posted, 0, INT_MAX);
-		user->lastcall = boolprompt("Set last login to now", 0) ?  time(NULL) : user->lastcall;
+		user->lastcall = boolprompt("Set last login to now", 0) ? time(NULL) : user->lastcall;
 		user->USuserpurge = intprompt("Purge time (in days, 0 for system default", user->USuserpurge, 0, INT_MAX);
 	}
 
@@ -238,8 +231,10 @@ void edituser(CtdlIPC *ipc, int cmd)
 	}
 	free(user);
 
-	if (boolprompt("Edit this user's Internet email addresses", 0)) {
-		edit_user_internet_email_addresses(ipc, who);
+	if (cmd == 25) {	// user edit
+		if (boolprompt("Edit this user's Internet email addresses", 0)) {
+			edit_user_internet_email_addresses(ipc, who);
+		}
 	}
 
 }
@@ -249,8 +244,7 @@ void edituser(CtdlIPC *ipc, int cmd)
  * yes or no.  Yes=1 and No=0, unless 'backwards' is set to a nonzero value
  * in which case No=1 and Yes=0.
  */
-int set_attr(CtdlIPC *ipc, unsigned int sval, char *prompt, unsigned int sbit, int backwards)
-{
+int set_attr(CtdlIPC * ipc, unsigned int sval, char *prompt, unsigned int sbit, int backwards) {
 	int a;
 	int temp;
 
@@ -262,35 +256,38 @@ int set_attr(CtdlIPC *ipc, unsigned int sval, char *prompt, unsigned int sbit, i
 	color(BRIGHT_MAGENTA);
 
 	if (backwards) {
-		scr_printf("%3s", ((temp&sbit) ? "No":"Yes"));
+		scr_printf("%3s", ((temp & sbit) ? "No" : "Yes"));
 	}
 	else {
-		scr_printf("%3s", ((temp&sbit) ? "Yes":"No"));
+		scr_printf("%3s", ((temp & sbit) ? "Yes" : "No"));
 	}
 
 	color(DIM_MAGENTA);
 	scr_printf("]? ");
 	color(BRIGHT_CYAN);
 	a = (temp & sbit);
-	if (a != 0) a = 1;
-	if (backwards) a = 1 - a;
+	if (a != 0)
+		a = 1;
+	if (backwards)
+		a = 1 - a;
 	a = yesno_d(a);
-	if (backwards) a = 1 - a;
+	if (backwards)
+		a = 1 - a;
 	color(DIM_WHITE);
-	temp = (temp|sbit);
-	if (!a) temp = (temp^sbit);
-	return(temp);
+	temp = (temp | sbit);
+	if (!a)
+		temp = (temp ^ sbit);
+	return (temp);
 }
 
 /*
  * modes are:  0 - .EC command, 1 - .EC for new user,
  *             2 - toggle Xpert mode  3 - toggle floor mode
  */
-void enter_config(CtdlIPC *ipc, int mode)
-{
+void enter_config(CtdlIPC * ipc, int mode) {
 	char buf[SIZ];
 	struct ctdluser *user = NULL;
-	int r;				/* IPC response code */
+	int r;			/* IPC response code */
 
 	r = CtdlIPCGetConfig(ipc, &user, buf);
 	if (r / 100 != 2) {
@@ -301,98 +298,43 @@ void enter_config(CtdlIPC *ipc, int mode)
 
 	if (mode == 0 || mode == 1) {
 
-		user->flags = set_attr(ipc, user->flags,
-				       "Are you an experienced Citadel user",
-				       US_EXPERT, 0);
+		user->flags = set_attr(ipc, user->flags, "Are you an experienced Citadel user", US_EXPERT, 0);
 		if ((user->flags & US_EXPERT) == 0 && mode == 1) {
 			free(user);
 			return;
 		}
 
-		user->flags = set_attr(
-			ipc,
-			user->flags,
-			"Print last old message on New message request",
-			US_LASTOLD,
-			0
-		);
-
-		user->flags = set_attr(
-			ipc,
-			user->flags,
-			"Prompt after each message",
-			US_NOPROMPT,
-			1
-		);
+		user->flags = set_attr(ipc, user->flags, "Print last old message on New message request", US_LASTOLD, 0);
+
+		user->flags = set_attr(ipc, user->flags, "Prompt after each message", US_NOPROMPT, 1);
 
 		if ((user->flags & US_NOPROMPT) == 0) {
-			user->flags = set_attr(
-				ipc,
-				user->flags,
-				"Use 'disappearing' prompts",
-				US_DISAPPEAR,
-				0
-			);
+			user->flags = set_attr(ipc, user->flags, "Use 'disappearing' prompts", US_DISAPPEAR, 0);
 		}
 
-		user->flags = set_attr(
-			ipc,
-			user->flags,
-			"Pause after each screenful of text",
-			US_PAGINATOR,
-			0
-		);
+		user->flags = set_attr(ipc, user->flags, "Pause after each screenful of text", US_PAGINATOR, 0);
 
 		if (rc_prompt_control == 3 && (user->flags & US_PAGINATOR)) {
-			user->flags = set_attr(
-				ipc,
-				user->flags,
-				"<N>ext and <S>top work at paginator prompt",
-				US_PROMPTCTL,
-				0
-			);
+			user->flags = set_attr(ipc, user->flags, "<N>ext and <S>top work at paginator prompt", US_PROMPTCTL, 0);
 		}
 
 		if (rc_floor_mode == RC_DEFAULT) {
-			user->flags = set_attr(
-				ipc,
-				user->flags,
-				"View rooms by floor",
-				US_FLOORS,
-				0
-			);
+			user->flags = set_attr(ipc, user->flags, "View rooms by floor", US_FLOORS, 0);
 		}
 
 		if (rc_ansi_color == 3) {
-			user->flags = set_attr(
-				ipc,
-				user->flags,
-				"Enable color support",
-				US_COLOR,
-				0
-			);
+			user->flags = set_attr(ipc, user->flags, "Enable color support", US_COLOR, 0);
 		}
 
-	 	if ((user->flags & US_EXPERT) == 0) {
+		if ((user->flags & US_EXPERT) == 0) {
 			formout(ipc, "unlisted");
 		}
 
-		user->flags = set_attr(
-			ipc,
-			user->flags,
-			"Be unlisted in userlog",
-			US_UNLISTED,
-			0
-		);
+		user->flags = set_attr(ipc, user->flags, "Be unlisted in userlog", US_UNLISTED, 0);
 
 		if (!IsEmptyStr(editor_path)) {
-			user->flags = set_attr(
-				ipc,
-				user->flags,
-				"Always enter messages with the full-screen editor",
-				US_EXTEDIT,
-				0
-			);
+			user->flags = set_attr(ipc,
+					       user->flags, "Always enter messages with the full-screen editor", US_EXTEDIT, 0);
 		}
 
 	}
@@ -401,7 +343,8 @@ void enter_config(CtdlIPC *ipc, int mode)
 		if (user->flags & US_EXPERT) {
 			user->flags ^= US_EXPERT;
 			scr_printf("Expert mode now OFF\n");
-		} else {
+		}
+		else {
 			user->flags |= US_EXPERT;
 			scr_printf("Expert mode now ON\n");
 		}
@@ -411,14 +354,16 @@ void enter_config(CtdlIPC *ipc, int mode)
 		if (user->flags & US_FLOORS) {
 			user->flags ^= US_FLOORS;
 			scr_printf("Floor mode now OFF\n");
-		} else {
+		}
+		else {
 			user->flags |= US_FLOORS;
 			scr_printf("Floor mode now ON\n");
 		}
 	}
 
 	r = CtdlIPCSetConfig(ipc, user, buf);
-	if (r / 100 != 2) scr_printf("%s\n", buf);
+	if (r / 100 != 2)
+		scr_printf("%s\n", buf);
 	userflags = user->flags;
 	free(user);
 }
@@ -427,94 +372,102 @@ void enter_config(CtdlIPC *ipc, int mode)
  * getstring()  -  get a line of text from a file
  *		   ignores lines beginning with "#"
  */
-int getstring(FILE *fp, char *string)
-{
-	int a,c;
+int getstring(FILE * fp, char *string) {
+	int a, c;
 	do {
-		strcpy(string,"");
-		a=0;
+		strcpy(string, "");
+		a = 0;
 		do {
-			c=getc(fp);
-			if (c<0) {
-				string[a]=0;
-				return(-1);
+			c = getc(fp);
+			if (c < 0) {
+				string[a] = 0;
+				return (-1);
 			}
-			string[a++]=c;
-		} while(c!=10);
-			string[a-1]=0;
-	} while(string[0]=='#');
-	return(strlen(string));
+			string[a++] = c;
+		} while (c != 10);
+		string[a - 1] = 0;
+	} while (string[0] == '#');
+	return (strlen(string));
 }
 
 
 /* Searches for patn in search string */
 int pattern(char *search, char *patn) {
-	int a,b,len;
-	
+	int a, b, len;
+
 	len = strlen(patn);
-	for (a=0; !IsEmptyStr(&search[a]); ++a) {
-		b=strncasecmp(&search[a],patn,len);
-		if (b==0) return(b);
+	for (a = 0; !IsEmptyStr(&search[a]); ++a) {
+		b = strncasecmp(&search[a], patn, len);
+		if (b == 0)
+			return (b);
 	}
-	return(-1);
+	return (-1);
 }
 
 
-void strproc(char *string)
-{
+void strproc(char *string) {
 	int a;
 
-	if (IsEmptyStr(string)) return;
+	if (IsEmptyStr(string))
+		return;
 
 	/* Convert non-printable characters to blanks */
-	for (a=0; !IsEmptyStr(&string[a]); ++a) {
-		if (string[a]<32) string[a]=32;
-		if (string[a]>126) string[a]=32;
+	for (a = 0; !IsEmptyStr(&string[a]); ++a) {
+		if (string[a] < 32)
+			string[a] = 32;
+		if (string[a] > 126)
+			string[a] = 32;
 	}
 
 	/* Remove leading and trailing blanks */
-	while(string[0]<33) strcpy(string,&string[1]);
-	while(string[strlen(string)-1]<33) string[strlen(string)-1]=0;
+	while (string[0] < 33)
+		strcpy(string, &string[1]);
+	while (string[strlen(string) - 1] < 33)
+		string[strlen(string) - 1] = 0;
 
 	/* Remove double blanks */
-	for (a=0; a<strlen(string); ++a) {
-		if ((string[a]==32)&&(string[a+1]==32)) {
-			strcpy(&string[a],&string[a+1]);
-			a=0;
+	for (a = 0; a < strlen(string); ++a) {
+		if ((string[a] == 32) && (string[a + 1] == 32)) {
+			strcpy(&string[a], &string[a + 1]);
+			a = 0;
 		}
 	}
 
 	/* remove characters which would interfere with the network */
-	for (a=0; a<strlen(string); ++a) {
-		if (string[a]=='!') strcpy(&string[a],&string[a+1]);
-		if (string[a]=='@') strcpy(&string[a],&string[a+1]);
-		if (string[a]=='_') strcpy(&string[a],&string[a+1]);
-		if (string[a]==',') strcpy(&string[a],&string[a+1]);
-		if (string[a]=='%') strcpy(&string[a],&string[a+1]);
-		if (string[a]=='|') strcpy(&string[a],&string[a+1]);
+	for (a = 0; a < strlen(string); ++a) {
+		if (string[a] == '!')
+			strcpy(&string[a], &string[a + 1]);
+		if (string[a] == '@')
+			strcpy(&string[a], &string[a + 1]);
+		if (string[a] == '_')
+			strcpy(&string[a], &string[a + 1]);
+		if (string[a] == ',')
+			strcpy(&string[a], &string[a + 1]);
+		if (string[a] == '%')
+			strcpy(&string[a], &string[a + 1]);
+		if (string[a] == '|')
+			strcpy(&string[a], &string[a + 1]);
 	}
 
 }
 
 
-void progress(CtdlIPC* ipc, unsigned long curr, unsigned long cmax)
-{
-	static char dots[] =
-		"**************************************************";
+void progress(CtdlIPC * ipc, unsigned long curr, unsigned long cmax) {
+	static char dots[] = "**************************************************";
 	char dots_printed[51];
 	char fmt[42];
 	unsigned long a;
 
 	if (curr >= cmax) {
-		scr_printf("\r%79s\r","");
-	} else {
+		scr_printf("\r%79s\r", "");
+	}
+	else {
 		/* a will be range 0-50 rather than 0-100 */
-		a=(curr * 50) / cmax;
+		a = (curr * 50) / cmax;
 		sprintf(fmt, "[%%s%%%lds] %%3ld%%%% %%10ld/%%10ld\r", 50 - a);
 		strncpy(dots_printed, dots, a);
 		dots_printed[a] = 0;
-		scr_printf(fmt, dots_printed, "",
-				curr * 100 / cmax, curr, cmax);
+		scr_printf(fmt, dots_printed, "", curr * 100 / cmax, curr, cmax);
 		scr_flush();
 	}
 }
@@ -524,40 +477,42 @@ void progress(CtdlIPC* ipc, unsigned long curr, unsigned long cmax)
  * NOT the same locate_host() in locate_host.c.  This one just does a
  * 'who am i' to try to discover where the user is...
  */
-void locate_host(CtdlIPC* ipc, char *hbuf)
-{
-	FILE *who = (FILE *)popen("who am i","r");
-	if (who==NULL) {
+void locate_host(CtdlIPC * ipc, char *hbuf) {
+	FILE *who = (FILE *) popen("who am i", "r");
+	if (who == NULL) {
 		strcpy(hbuf, ipc->ServInfo.fqdn);
-		return;	
+		return;
 	}
 	fgets(hbuf, SIZ, who);
+	if (hbuf[strlen(hbuf) - 1] == '\n') {
+		hbuf[strlen(hbuf) - 1] = 0;
+	}
 	pclose(who);
-	stripallbut(hbuf, '(' , ')' );
+	stripallbut(hbuf, '(', ')');
 }
 
 /*
  * miscellaneous server commands (testing, etc.)
  */
-void misc_server_cmd(CtdlIPC *ipc, char *cmd) {
+void misc_server_cmd(CtdlIPC * ipc, char *cmd) {
 	char buf[SIZ];
 
 	CtdlIPC_chat_send(ipc, cmd);
 	CtdlIPC_chat_recv(ipc, buf);
-	scr_printf("%s\n",buf);
-	if (buf[0]=='1') {
+	scr_printf("%s\n", buf);
+	if (buf[0] == '1') {
 		set_keepalives(KA_HALF);
-		while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf,"000")) {
-			scr_printf("%s\n",buf);
+		while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) {
+			scr_printf("%s\n", buf);
 		}
 		set_keepalives(KA_YES);
 		return;
 	}
-	if (buf[0]=='4') {
+	if (buf[0] == '4') {
 		do {
-			newprompt("> ",buf,255);
+			newprompt("> ", buf, 255);
 			CtdlIPC_chat_send(ipc, buf);
-		} while(strcmp(buf,"000"));
+		} while (strcmp(buf, "000"));
 		return;
 	}
 }
@@ -566,46 +521,44 @@ void misc_server_cmd(CtdlIPC *ipc, char *cmd) {
 /*
  * compute the checksum of a file
  */
-int file_checksum(char *filename)
-{
+int file_checksum(char *filename) {
 	int cksum = 0;
 	int ch;
 	FILE *fp;
 
-	fp = fopen(filename,"r");
-	if (fp == NULL) return(0);
+	fp = fopen(filename, "r");
+	if (fp == NULL)
+		return (0);
 
 	/* yes, this algorithm may allow cksum to overflow, but that's ok
 	 * as long as it overflows consistently, which it will.
 	 */
-	while (ch=getc(fp), ch>=0) {
+	while (ch = getc(fp), ch >= 0) {
 		cksum = (cksum + ch);
 	}
 
 	fclose(fp);
-	return(cksum);
+	return (cksum);
 }
 
 /*
  * nuke a directory and its contents
  */
-int nukedir(char *dirname)
-{
+int nukedir(char *dirname) {
 	DIR *dp;
 	struct dirent *d;
 	char filename[SIZ];
 
 	dp = opendir(dirname);
 	if (dp == NULL) {
-		return(errno);
+		return (errno);
 	}
 
 	while (d = readdir(dp), d != NULL) {
-		snprintf(filename, sizeof filename, "%s/%s",
-			dirname, d->d_name);
+		snprintf(filename, sizeof filename, "%s/%s", dirname, d->d_name);
 		unlink(filename);
 	}
 
 	closedir(dp);
-	return(rmdir(dirname));
+	return (rmdir(dirname));
 }