X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcommands.c;h=427887cbb67554bd5d4670856a953e74947907be;hb=4eb74b26380dfde31c86c685f0589e0c653aebf0;hp=cfb6b97614eb8c4c97104ea211905d64ec9e7fa1;hpb=41ddb5b6fc7fdf77fd8d8dd83d6f6536967e9a33;p=citadel.git

diff --git a/citadel/commands.c b/citadel/commands.c
index cfb6b9761..427887cbb 100644
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -4,6 +4,21 @@
  * This file contains functions which implement parts of the
  * text-mode user interface.
  *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -43,6 +58,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "citadel_ipc.h"
 #include "commands.h"
@@ -50,13 +66,14 @@
 #include "citadel_decls.h"
 #include "routines.h"
 #include "routines2.h"
-#include "tools.h"
 #include "rooms.h"
 #include "client_chat.h"
+#include "citadel_dirs.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
 #include "screen.h"
+#include "ecrash.h"
 
 struct citcmd {
 	struct citcmd *next;
@@ -76,11 +93,10 @@ int rc_force_mail_prompts;
 int rc_remember_passwords;
 int rc_ansi_color;
 int rc_color_use_bg;
-int num_urls = 0;
 int rc_prompt_control = 0;
 time_t rc_idle_threshold = (time_t)900;
-char urls[MAXURLS][SIZ];
 char rc_url_cmd[SIZ];
+char rc_open_cmd[SIZ];
 char rc_gotmail_cmd[SIZ];
 
 char *gl_string;
@@ -96,7 +112,7 @@ struct citcmd *cmdlist = NULL;
 
 /* these variables are local to this module */
 char keepalives_enabled = KA_YES;	/* send NOOPs to server when idle */
-int ok_to_interrupt = 0;		/* print express msgs asynchronously */
+int ok_to_interrupt = 0;		/* print instant msgs asynchronously */
 time_t AnsiDetect;			/* when did we send the detect code? */
 int enable_color = 0;			/* nonzero for ANSI color */
 
@@ -159,7 +175,7 @@ int checkpagin(int lp, unsigned int pagin, unsigned int height)
 	if (!pagin) return(0);
 	if (lp>=(height-1)) {
 		set_keepalives(KA_HALF);
-		hit_any_key();
+		hit_any_key(ipc_for_signal_handlers);	/* Cheating -IO */
 		set_keepalives(KA_YES);
 		return(0);
 	}
@@ -187,7 +203,7 @@ void pprintf(const char *format, ...) {
         vsnprintf(buf, sizeof(buf), format, arg_ptr);   
         va_end(arg_ptr);   
 
-	for (i=0; i<strlen(buf); ++i) {
+	for (i=0; !IsEmptyStr(&buf[i]); ++i) {
 		scr_putc(buf[i]);
 		if (buf[i]==10) {
 			++lines_printed;
@@ -201,44 +217,44 @@ void pprintf(const char *format, ...) {
 
 
 /*
- * print_express()  -  print express messages if there are any
+ * print_instant()  -  print instant messages if there are any
  */
-void print_express(void)
+void print_instant(void)
 {
 	char buf[1024];
 	FILE *outpipe;
 	time_t timestamp;
-	struct tm *stamp;
+	struct tm stamp;
 	int flags = 0;
 	char sender[64];
 	char node[64];
 	char *listing = NULL;
 	int r;			/* IPC result code */
 
-	if (express_msgs == 0)
+	if (instant_msgs == 0)
 		return;
 
 	if (rc_exp_beep) {
 		ctdl_beep();
 	}
-	if (strlen(rc_exp_cmd) == 0) {
+	if (IsEmptyStr(rc_exp_cmd)) {
 		color(BRIGHT_RED);
 		scr_printf("\r---");
 	}
 	
-	while (express_msgs != 0) {
+	while (instant_msgs != 0) {
 		r = CtdlIPCGetInstantMessage(ipc_for_signal_handlers, &listing, buf);
 		if (r / 100 != 1)
 			return;
 	
-		express_msgs = extract_int(buf, 0);
+		instant_msgs = extract_int(buf, 0);
 		timestamp = extract_long(buf, 1);
 		flags = extract_int(buf, 2);
-		extract(sender, buf, 3);
-		extract(node, buf, 4);
+		extract_token(sender, buf, 3, '|', sizeof sender);
+		extract_token(node, buf, 4, '|', sizeof node);
 		strcpy(last_paged, sender);
 	
-		stamp = localtime(&timestamp);
+		localtime_r(&timestamp, &stamp);
 
 		/* If the page is a Logoff Request, honor it. */
 		if (flags & 2) {
@@ -246,7 +262,7 @@ void print_express(void)
 			return;
 		}
 	
-		if (strlen(rc_exp_cmd) > 0) {
+		if (!IsEmptyStr(rc_exp_cmd)) {
 			outpipe = popen(rc_exp_cmd, "w");
 			if (outpipe != NULL) {
 				/* Header derived from flags */
@@ -260,28 +276,28 @@ void print_express(void)
 				else
 					fprintf(outpipe, "Message ");
 				/* Timestamp.  Can this be improved? */
-				if (stamp->tm_hour == 0 || stamp->tm_hour == 12)
+				if (stamp.tm_hour == 0 || stamp.tm_hour == 12)
 					fprintf(outpipe, "at 12:%02d%cm",
-						stamp->tm_min, 
-						stamp->tm_hour ? 'p' : 'a');
-				else if (stamp->tm_hour > 12)		/* pm */
+						stamp.tm_min, 
+						stamp.tm_hour ? 'p' : 'a');
+				else if (stamp.tm_hour > 12)		/* pm */
 					fprintf(outpipe, "at %d:%02dpm",
-						stamp->tm_hour - 12,
-						stamp->tm_min);
+						stamp.tm_hour - 12,
+						stamp.tm_min);
 				else					/* am */
 					fprintf(outpipe, "at %d:%02dam",
-						stamp->tm_hour, stamp->tm_min);
+						stamp.tm_hour, stamp.tm_min);
 				fprintf(outpipe, " from %s", sender);
-				if (strncmp(serv_info.serv_nodename, node, 32))
+				if (strncmp(ipc_for_signal_handlers->ServInfo.nodename, node, 32))
 					fprintf(outpipe, " @%s", node);
 				fprintf(outpipe, ":\n%s\n", listing);
 				pclose(outpipe);
-				if (express_msgs == 0)
+				if (instant_msgs == 0)
 					return;
 				continue;
 			}
 		}
-		/* fall back to built-in express message display */
+		/* fall back to built-in instant message display */
 		scr_printf("\n");
 		lines_printed++;
 
@@ -296,20 +312,20 @@ void print_express(void)
 			scr_printf("Message ");
 	
 		/* Timestamp.  Can this be improved? */
-		if (stamp->tm_hour == 0 || stamp->tm_hour == 12)/* 12am/12pm */
-			scr_printf("at 12:%02d%cm", stamp->tm_min, 
-				stamp->tm_hour ? 'p' : 'a');
-		else if (stamp->tm_hour > 12)			/* pm */
+		if (stamp.tm_hour == 0 || stamp.tm_hour == 12)/* 12am/12pm */
+			scr_printf("at 12:%02d%cm", stamp.tm_min, 
+				stamp.tm_hour ? 'p' : 'a');
+		else if (stamp.tm_hour > 12)			/* pm */
 			scr_printf("at %d:%02dpm",
-				stamp->tm_hour - 12, stamp->tm_min);
+				stamp.tm_hour - 12, stamp.tm_min);
 		else						/* am */
-			scr_printf("at %d:%02dam", stamp->tm_hour, stamp->tm_min);
+			scr_printf("at %d:%02dam", stamp.tm_hour, stamp.tm_min);
 		
 		/* Sender */
 		scr_printf(" from %s", sender);
 	
 		/* Remote node, if any */
-		if (strncmp(serv_info.serv_nodename, node, 32))
+		if (strncmp(ipc_for_signal_handlers->ServInfo.nodename, node, 32))
 			scr_printf(" @%s", node);
 	
 		scr_printf(":\n");
@@ -352,15 +368,21 @@ static void really_do_keepalive(void) {
 
 	time(&idlet);
 
+	/* This may sometimes get called before we are actually connected
+	 * to the server.  Don't do anything if we aren't connected. -IO
+	 */
+	if (!ipc_for_signal_handlers)
+		return;
+
 	/* If full keepalives are enabled, send a NOOP to the server and
 	 * wait for a response.
 	 */
 	if (keepalives_enabled == KA_YES) {
 		r = CtdlIPCNoop(ipc_for_signal_handlers);
-		if (express_msgs > 0) {
+		if (instant_msgs > 0) {
 			if (ok_to_interrupt == 1) {
 				scr_printf("\r%64s\r", "");
-				print_express();
+				print_instant();
 				scr_printf("%s%c ", room_name,
 				       room_prompt(room_flags));
 				scr_flush();
@@ -372,8 +394,8 @@ static void really_do_keepalive(void) {
 	 * server supports it) and then do nothing.
 	 */
 	if ( (keepalives_enabled == KA_HALF)
-	   && (serv_info.serv_supports_qnop > 0) ) {
-		CtdlIPC_putline(ipc_for_signal_handlers, "QNOP");
+	   && (ipc_for_signal_handlers->ServInfo.supports_qnop > 0) ) {
+		CtdlIPC_chat_send(ipc_for_signal_handlers, "QNOP");
 	}
 }
 
@@ -388,9 +410,22 @@ static int async_ka_enabled = 0;
 
 static void *ka_thread(void *arg)
 {
+#ifdef HAVE_BACKTRACE
+	char threadName[256];
+
+	// Set up our name
+	sprintf(threadName, "ka_Thread n");
+
+	// Register for tracing
+	eCrash_RegisterThread(threadName, 0);
+#endif
 	really_do_keepalive();
 	pthread_detach(ka_thr_handle);
 	ka_thr_active = 0;
+	
+#ifdef HAVE_BACKTRACE
+	eCrash_UnregisterThread();
+#endif
 	return NULL;
 }
 
@@ -474,9 +509,9 @@ int inkey(void)
 		 * necessary and then waits again.
 		 */
 		do {
-			scr_set_windowsize();
+			scr_set_windowsize(ipc_for_signal_handlers);
 			do_keepalive();
-			scr_set_windowsize();
+			scr_set_windowsize(ipc_for_signal_handlers);
 
 			FD_ZERO(&rfds);
 			FD_SET(0, &rfds);
@@ -489,21 +524,28 @@ int inkey(void)
 		/* At this point, there's input, so fetch it.
 		 * (There's a hole in the bucket...)
 		 */
-		a = scr_getc(SCR_NOBLOCK);
-		if (a == 127)
+		a = scr_getc(SCR_BLOCK);
+		if (a == 127) {
 			a = 8;
-		if (a > 126)
-			a = 0;
-		if (a == 13)
+		}
+		if (a == 13) {
 			a = 10;
+		}
+/* not so fast there dude, we have to handle UTF-8 and ISO-8859-1...
+		if (a > 126) {
+			a = 0;
+		}
 		if (((a != 23) && (a != 4) && (a != 10) && (a != 8) && (a != NEXT_KEY) && (a != STOP_KEY))
-		    && ((a < 32) || (a > 126)))
+		    && ((a < 32) || (a > 126))) {
 			a = 0;
+		}
+ */
 
 #ifndef DISABLE_CURSES
 #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
-		if (a == ERR)
-			a = 0;
+		if (a == ERR) {
+			logoff(NULL, 3);
+		}
 #endif
 #endif
 
@@ -555,7 +597,7 @@ int yesno_d(int d)
 /* Gets a line from the terminal */
 /* string == Pointer to string buffer */
 /* lim == Maximum length - if negative, no-show */
-void getline(char *string, int lim) 
+void ctdl_getline(char *string, int lim) 
 {
 	int a, b;
 	char flag = 0;
@@ -567,9 +609,10 @@ void getline(char *string, int lim)
 	strcpy(string, "");
 	gl_string = string;
 	async_ka_start();
-      GLA:a = inkey();
-	a = (a & 127);
-	if ((a == 8 || a == 23) && (strlen(string) == 0))
+
+GLA:	a = inkey();
+	/* a = (a & 127); ** commented out because it isn't just an ASCII world anymore */
+	if ((a == 8 || a == 23) && (IsEmptyStr(string)))
 		goto GLA;
 	if ((a != 10) && (a != 8) && (strlen(string) == lim))
 		goto GLA;
@@ -582,7 +625,7 @@ void getline(char *string, int lim)
 		do {
 			string[strlen(string) - 1] = 0;
 			scr_putc(8); scr_putc(32); scr_putc(8);
-		} while (strlen(string) && string[strlen(string) - 1] != ' ');
+		} while (!IsEmptyStr(string) && string[strlen(string) - 1] != ' ');
 		goto GLA;
 	}
 	if ((a == 10)) {
@@ -612,7 +655,7 @@ void strprompt(char *prompt, char *str, int len)
 	int i;
 	char buf[128];
 
-	print_express();
+	print_instant();
 	color(DIM_WHITE);
 	scr_printf("%s ", prompt);
 	color(DIM_MAGENTA);
@@ -623,7 +666,7 @@ void strprompt(char *prompt, char *str, int len)
 		scr_printf("%s", str);
 	}
 	else {
-		for (i=0; i<strlen(str); ++i) {
+		for (i=0; !IsEmptyStr(&str[i]); ++i) {
 			scr_printf("*");
 		}
 	}
@@ -633,7 +676,7 @@ void strprompt(char *prompt, char *str, int len)
 	color(DIM_WHITE);
 	scr_printf(": ");
 	color(BRIGHT_CYAN);
-	getline(buf, len);
+	ctdl_getline(buf, len);
 	if (buf[0] != 0)
 		strcpy(str, buf);
 	color(DIM_WHITE);
@@ -676,7 +719,7 @@ int intprompt(char *prompt, int ival, int imin, int imax)
 		snprintf(buf, sizeof buf, "%d", i);
 		strprompt(prompt, buf, 15);
 		i = atoi(buf);
-		for (p=0; p<strlen(buf); ++p) {
+		for (p=0; !IsEmptyStr(&buf[p]); ++p) {
 			if ( (!isdigit(buf[p]))
 			   && ( (buf[p]!='-') || (p!=0) )  )
 				i = imin - 1;
@@ -698,7 +741,7 @@ void newprompt(char *prompt, char *str, int len)
 	color(BRIGHT_MAGENTA);
 	scr_printf("%s", prompt);
 	color(DIM_MAGENTA);
-	getline(str, len);
+	ctdl_getline(str, len);
 	color(DIM_WHITE);
 }
 
@@ -719,16 +762,20 @@ void load_command_set(void)
 {
 	FILE *ccfile;
 	char buf[1024];
+	char editor_key[100];
 	struct citcmd *cptr;
 	struct citcmd *lastcmd = NULL;
 	int a, d;
 	int b = 0;
+	int i;
 
 
 	/* first, set up some defaults for non-required variables */
 
-	strcpy(editor_path, "");
+	for (i = 0; i < MAX_EDITORS; i++)
+		strcpy(editor_paths[i], "");
 	strcpy(printcmd, "");
+	strcpy(imagecmd, "");
 	strcpy(rc_username, "");
 	strcpy(rc_password, "");
 	rc_floor_mode = 0;
@@ -741,6 +788,7 @@ void load_command_set(void)
 	rc_ansi_color = 0;
 	rc_color_use_bg = 0;
 	strcpy(rc_url_cmd, "");
+	strcpy(rc_open_cmd, "");
 	strcpy(rc_gotmail_cmd, "");
 #ifdef HAVE_OPENSSL
 	rc_encrypt = RC_DEFAULT;
@@ -758,8 +806,7 @@ void load_command_set(void)
 		ccfile = fopen(buf, "r");
 	}
 	if (ccfile == NULL) {
-		snprintf(buf, sizeof buf, "%s/citadel.rc", BBSDIR);
-		ccfile = fopen(buf, "r");
+		ccfile = fopen(file_citadel_rc, "r");
 	}
 	if (ccfile == NULL) {
 		ccfile = fopen("/etc/citadel.rc", "r");
@@ -772,7 +819,7 @@ void load_command_set(void)
 		logoff(NULL, 3);
 	}
 	while (fgets(buf, sizeof buf, ccfile) != NULL) {
-		while ((strlen(buf) > 0) ? (isspace(buf[strlen(buf) - 1])) : 0)
+		while ((!IsEmptyStr(buf)) ? (isspace(buf[strlen(buf) - 1])) : 0)
 			buf[strlen(buf) - 1] = 0;
 
 		if (!strncasecmp(buf, "encrypt=", 8)) {
@@ -804,11 +851,21 @@ void load_command_set(void)
 #endif
 
 		if (!strncasecmp(buf, "editor=", 7))
-			strcpy(editor_path, &buf[7]);
+			strcpy(editor_paths[0], &buf[7]);
+
+		for (i = 0; i < MAX_EDITORS; i++)
+		{
+			sprintf(editor_key, "editor%d=", i);
+			if (!strncasecmp(buf, editor_key, strlen(editor_key)))
+				strcpy(editor_paths[i], &buf[strlen(editor_key)]);
+		}
 
 		if (!strncasecmp(buf, "printcmd=", 9))
 			strcpy(printcmd, &buf[9]);
 
+		if (!strncasecmp(buf, "imagecmd=", 9))
+			strcpy(imagecmd, &buf[9]);
+
 		if (!strncasecmp(buf, "expcmd=", 7))
 			strcpy(rc_exp_cmd, &buf[7]);
 
@@ -830,7 +887,7 @@ void load_command_set(void)
 			rc_allow_attachments = atoi(&buf[18]);
 		}
 		if (!strncasecmp(buf, "idle_threshold=", 15)) {
-			rc_idle_threshold = atoi(&buf[15]);
+			rc_idle_threshold = atol(&buf[15]);
 		}
 		if (!strncasecmp(buf, "remember_passwords=", 19)) {
 			rc_remember_passwords = atoi(&buf[19]);
@@ -868,15 +925,21 @@ void load_command_set(void)
 		if (!strncasecmp(buf, "urlcmd=", 7))
 			strcpy(rc_url_cmd, &buf[7]);
 
+		if (!strncasecmp(buf, "opencmd=", 7))
+			strcpy(rc_open_cmd, &buf[8]);
+
 		if (!strncasecmp(buf, "gotmailcmd=", 11))
 			strcpy(rc_gotmail_cmd, &buf[11]);
 
 		if (!strncasecmp(buf, "alternate_semantics=", 20)) {
-			if (!strncasecmp(&buf[11], "yes", 3))
+			if (!strncasecmp(&buf[20], "yes", 3)) {
 				rc_alt_semantics = 1;
-			if (!strncasecmp(&buf[11], "no", 2))
+			}
+			else {
 				rc_alt_semantics = 0;
+			}
 		}
+
 		if (!strncasecmp(buf, "cmd=", 4)) {
 			strcpy(buf, &buf[4]);
 
@@ -900,7 +963,7 @@ void load_command_set(void)
 			a = 0;
 			b = 0;
 			buf[strlen(buf) + 1] = 0;
-			while (strlen(buf) > 0) {
+			while (!IsEmptyStr(buf)) {
 				b = strlen(buf);
 				for (d = strlen(buf); d >= 0; --d)
 					if (buf[d] == ',')
@@ -934,7 +997,7 @@ char keycmd(char *cmdstr)
 {
 	int a;
 
-	for (a = 0; a < strlen(cmdstr); ++a)
+	for (a = 0; !IsEmptyStr(&cmdstr[a]); ++a)
 		if (cmdstr[a] == '&')
 			return (tolower(cmdstr[a + 1]));
 	return (0);
@@ -953,11 +1016,14 @@ char *cmd_expand(char *strbuf, int mode)
 
 	strcpy(exp, strbuf);
 
-	for (a = 0; a < strlen(exp); ++a) {
+	for (a = 0; exp[a]; ++a) {
 		if (strbuf[a] == '&') {
 
+			/* dont echo these non mnemonic command keys */
+			int noecho = strbuf[a+1] == '<' || strbuf[a+1] == '>' || strbuf[a+1] == '+' || strbuf[a+1] == '-';
+
 			if (mode == 0) {
-				strcpy(&exp[a], &exp[a + 1]);
+				strcpy(&exp[a], &exp[a + 1 + noecho]);
 			}
 			if (mode == 1) {
 				exp[a] = '<';
@@ -1016,7 +1082,7 @@ int requires_string(struct citcmd *cptr, int ncomp)
 	char buf[64];
 
 	strcpy(buf, cptr->c_keys[ncomp - 1]);
-	for (a = 0; a < strlen(buf); ++a) {
+	for (a = 0; !IsEmptyStr(&buf[a]); ++a) {
 		if (buf[a] == ':')
 			return (1);
 	}
@@ -1057,7 +1123,7 @@ int getcmd(CtdlIPC *ipc, char *argbuf)
 	/* if we're running in idiot mode, display a cute little menu */
 	IFNEXPERT formout(ipc, "mainmenu");
 
-	print_express();
+	print_instant();
 	strcpy(argbuf, "");
 	cmdpos = 0;
 	for (a = 0; a < 5; ++a)
@@ -1122,7 +1188,7 @@ int getcmd(CtdlIPC *ipc, char *argbuf)
 			if (cmdmatch(cmdbuf, cptr, 5)) {
 				/* We've found our command. */
 				if (requires_string(cptr, cmdpos)) {
-					getline(argbuf, 32);
+					ctdl_getline(argbuf, 64);
 				} else {
 					scr_printf("\n");
 				}
@@ -1139,6 +1205,13 @@ int getcmd(CtdlIPC *ipc, char *argbuf)
 				    || (cptr->c_cmdnum == 20))
 					next_lazy_cmd = 13;
 
+				/* If this command is "read new"
+				 * then the next lazy-command (space bar)
+				 * should be "goto"
+				 */
+				if (cptr->c_cmdnum == 13)
+					next_lazy_cmd = 5;
+
 				return (cptr->c_cmdnum);
 
 			}
@@ -1149,11 +1222,13 @@ int getcmd(CtdlIPC *ipc, char *argbuf)
 			for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
 				if (cmdmatch(cmdbuf, cptr, cmdpos)) {
 					for (a = 0; a < 5; ++a) {
-						pprintf("%s ", cmd_expand(cptr->c_keys[a], 1));
+					   keyopt(cmd_expand(cptr->c_keys[a], 1));
+    				   pprintf(" ");
 					}
 					pprintf("\n");
 				}
 			}
+        	sigcaught = 0;
 
 			pprintf("\n%s%c ", room_name, room_prompt(room_flags));
 			got = 0;
@@ -1178,13 +1253,13 @@ int getcmd(CtdlIPC *ipc, char *argbuf)
 /*
  * set tty modes.  commands are:
  * 
- * 01- set to bbs mode
+ * 01- set to Citadel mode
  * 2 - save current settings for later restoral
  * 3 - restore saved settings
  */
 #ifdef HAVE_TERMIOS_H
-void sttybbs(int cmd)
-{				/* SysV version of sttybbs() */
+void stty_ctdl(int cmd)
+{				/* SysV version of stty_ctdl() */
 	struct termios live;
 	static struct termios saved_settings;
 	static int last_cmd = 0;
@@ -1227,8 +1302,8 @@ void sttybbs(int cmd)
 
 }
 #else
-void sttybbs(int cmd)
-{				/* BSD version of sttybbs() */
+void stty_ctdl(int cmd)
+{				/* BSD version of stty_ctdl() */
 	struct sgttyb live;
 	static struct sgttyb saved_settings;
 	static int last_cmd = 0;
@@ -1268,116 +1343,140 @@ void display_help(CtdlIPC *ipc, char *name)
 
 
 /*
- * fmout()  -  Citadel text formatter and paginator
+ * fmout() - Citadel text formatter and paginator
  */
 int fmout(
 	int width,	/* screen width to use */
 	FILE *fpin,	/* file to read from, or NULL to format given text */
-	char *text,	/* Text to be formatted (when fpin is NULL) */
-	FILE *fpout,	/* File to write to, or NULL to write to screen */
+	char *text,	/* text to be formatted (when fpin is NULL */
+	FILE *fpout,	/* file to write to, or NULL to write to screen */
 	char pagin,	/* nonzero if we should use the paginator */
 	int height,	/* screen height to use */
 	int starting_lp,/* starting value for lines_printed, -1 for global */
 	int subst)	/* nonzero if we should use hypertext mode */
 {
-	int a, b, c, old;
-	int real = (-1);
-	char aaa[140];
-	char buffer[512];
-	char *e;
-	int eof_flag = 0;
-
-	num_urls = 0;	/* Start with a clean slate of embedded URL's */
-
-	if (starting_lp >= 0) {
-		lines_printed = starting_lp;
-	}
-	strcpy(aaa, "");
-	old = 255;
-	strcpy(buffer, "");
-	c = 1;			/* c is the current pos */
-	e = text;		/* e is pointer to current pos */
-
-FMTA:	while ((eof_flag == 0) && (strlen(buffer) < 126)) {
-		if (fpin != NULL) {	/* read from file */
-			if (feof(fpin))
-				eof_flag = 1;
-			if (eof_flag == 0) {
-				a = getc(fpin);
-				buffer[strlen(buffer) + 1] = 0;
-				buffer[strlen(buffer)] = a;
-			}
-		} else {	/* read from text */
-			if (!*e) {
-				eof_flag = 1;
-				while (isspace(buffer[strlen(buffer) - 1]))
-					buffer[strlen(buffer) - 1] = 0;
-				buffer[strlen(buffer) + 1] = 0;
-				buffer[strlen(buffer)] = 10;
-			}
-			if (eof_flag == 0) {
-				a = *e++;
-				buffer[strlen(buffer) + 1] = 0;
-				buffer[strlen(buffer)] = a;
-			}
-		}
+	char *buffer = NULL;	/* The current message */
+	char *word = NULL;	/* What we are about to actually print */
+	char *e;		/* Pointer to position in text */
+	char old = 0;		/* The previous character */
+	int column = 0;		/* Current column */
+	size_t i;		/* Generic counter */
+
+	/* Space for a single word, which can be at most screenwidth */
+	word = (char *)calloc(1, width);
+	if (!word) {
+		err_printf("Can't alloc memory to print message: %s!\n",
+				strerror(errno));
+		logoff(NULL, 3);
 	}
 
-	if ( (!strncasecmp(buffer, "http://", 7))
-	   || (!strncasecmp(buffer, "ftp://", 6)) ) {
-		safestrncpy(urls[num_urls], buffer, (SIZ-1));
-		for (a=0; a<strlen(urls[num_urls]); ++a) {
-			b = urls[num_urls][a];
-			if ( (b==' ') || (b==')') || (b=='>') || (b==10)
-			   || (b==13) || (b==9) || (b=='\"') )
-				urls[num_urls][a] = 0;
+	/* Read the entire message body into memory */
+	if (fpin) {
+		buffer = load_message_from_file(fpin);
+		if (!buffer) {
+			err_printf("Can't print message: %s!\n",
+					strerror(errno));
+			logoff(NULL, 3);
 		}
-		++num_urls;
+	} else {
+		buffer = text;
 	}
+	e = buffer;
 
-	buffer[strlen(buffer) + 1] = 0;
-	a = buffer[0];
-	strcpy(buffer, &buffer[1]);
-
-	old = real;
-	real = a;
-	if (a <= 0)
-		goto FMTEND;
+	if (starting_lp >= 0)
+		lines_printed = starting_lp;
 
-	if (((a == 13) || (a == 10)) && (old != 13) && (old != 10))
-		a = 32;
-	if (((old == 13) || (old == 10)) && (isspace(real))) {
-		if (fpout) {
-			fprintf(fpout, "\n");
-		} else {
-			scr_printf("\n");
-			++lines_printed;
-			lines_printed = checkpagin(lines_printed, pagin, height);
+	/* Run the message body */
+	while (*e) {
+		/* Catch characters that shouldn't be there at all */
+		if (*e == '\r') {
+			e++;
+			continue;
+		}
+		/* First, are we looking at a newline? */
+		if (*e == '\n') {
+			e++;
+			if (*e == ' ') {	/* Paragraph */
+				if (fpout) {
+					fprintf(fpout, "\n");
+				} else {
+					scr_printf("\n");
+					++lines_printed;
+					lines_printed = checkpagin(lines_printed, pagin, height);
+				}
+				column = 0;
+			} else if (old != ' ') {/* Don't print two spaces */
+				if (fpout) {
+					fprintf(fpout, " ");
+				} else {
+					scr_printf(" ");
+				}
+				column++;
+			}
+			old = '\n';
+			continue;
 		}
-		c = 1;
-	}
-	if (a > 126)
-		goto FMTA;
 
-	if (a > 32) {
-		if (((strlen(aaa) + c) > (width - 1)) && (strlen(aaa) > (width - 1))) {
-			if (fpout) {
-				fprintf(fpout, "\n%s", aaa);
-			} else {
-				scr_printf("\n%s", aaa);
-				++lines_printed;
-				lines_printed = checkpagin(lines_printed, pagin, height);
+		/* Are we looking at a nonprintable?
+		 * (This section is now commented out because we could be displaying
+		 * a character set like UTF-8 or ISO-8859-1.)
+		if ( (*e < 32) || (*e > 126) ) {
+			e++;
+			continue;
+		} */
+
+		/* Or are we looking at a space? */
+		if (*e == ' ') {
+			e++;
+			if (column >= width - 1) {
+				/* Are we in the rightmost column? */
+				if (fpout) {
+					fprintf(fpout, "\n");
+				} else {
+					scr_printf("\n");
+					++lines_printed;
+					lines_printed = checkpagin(lines_printed, pagin, height);
+				}
+				column = 0;
+			} else if (!(column == 0 && old == ' ')) {
+				/* Eat only the first space on a line */
+				if (fpout) {
+					fprintf(fpout, " ");
+				} else {
+					scr_printf(" ");
+				}
+				column++;
 			}
-			c = strlen(aaa);
-			aaa[0] = 0;
+			/* ONLY eat the FIRST space on a line */
+			old = ' ';
+			continue;
 		}
-		b = strlen(aaa);
-		aaa[b] = a;
-		aaa[b + 1] = 0;
-	}
-	if (a == 32) {
-		if ((strlen(aaa) + c) > (width - 1)) {
-			c = 1;
+		old = *e;
+
+		/* Read a word, slightly messy */
+		i = 0;
+		while (e[i]) {
+			if (!isprint(e[i]) && !isspace(e[i]))
+				e[i] = ' ';
+			if (isspace(e[i]))
+				break;
+			i++;
+		}
+
+		/* We should never see these, but... slightly messy */
+		if (e[i] == '\t' || e[i] == '\f' || e[i] == '\v')
+			e[i] = ' ';
+
+		/* Break up really long words */
+		/* TODO: auto-hyphenation someday? */
+		if (i >= width)	
+			i = width - 1;
+		strncpy(word, e, i);
+		word[i] = 0;
+
+		/* Decide where to print the word */
+		if (column + i >= width) {
+			/* Wrap to the next line */
 			if (fpout) {
 				fprintf(fpout, "\n");
 			} else {
@@ -1385,34 +1484,24 @@ FMTA:	while ((eof_flag == 0) && (strlen(buffer) < 126)) {
 				++lines_printed;
 				lines_printed = checkpagin(lines_printed, pagin, height);
 			}
+			column = 0;
 		}
+
+		/* Print the word */
 		if (fpout) {
-			fprintf(fpout, "%s ", aaa);
-		} else {
-			scr_printf("%s ", aaa);
-		}
-		++c;
-		c = c + strlen(aaa);
-		strcpy(aaa, "");
-		goto FMTA;
-	}
-	if ((a == 13) || (a == 10)) {
-		if (fpout) {
-			fprintf(fpout, "%s\n", aaa);
+			fprintf(fpout, "%s", word);
 		} else {
-			scr_printf("%s\n", aaa);
-			++lines_printed;
-			lines_printed = checkpagin(lines_printed, pagin, height);
+			scr_printf("%s", word);
 		}
-		c = 1;
-		if (sigcaught) goto FMTEND;
-		strcpy(aaa, "");
-		goto FMTA;
+		column += i;
+		e += i;		/* Start over with the whitepsace! */
 	}
-	goto FMTA;
 
-	/* keypress caught; drain the server */
-FMTEND:
+	free(word);
+	if (fpin)		/* We allocated this, remember? */
+		free(buffer);
+
+	/* Is this necessary?  It makes the output kind of spacey. */
 	if (fpout) {
 		fprintf(fpout, "\n");
 	} else {
@@ -1420,7 +1509,8 @@ FMTEND:
 		++lines_printed;
 		lines_printed = checkpagin(lines_printed, pagin, height);
 	}
-	return (sigcaught);
+
+	return sigcaught;
 }
 
 
@@ -1494,7 +1584,7 @@ void look_for_ansi(void)
 	struct timeval tv;
 	char abuf[512];
 	time_t now;
-	int a;
+	int a, rv;
 
 	if (rc_ansi_color == 0) {
 		enable_color = 0;
@@ -1519,11 +1609,11 @@ void look_for_ansi(void)
 			select(1, &rfds, NULL, NULL, &tv);
 			if (FD_ISSET(0, &rfds)) {
 				abuf[strlen(abuf) + 1] = 0;
-				read(0, &abuf[strlen(abuf)], 1);
+				rv = read(0, &abuf[strlen(abuf)], 1);
 			}
 		} while (FD_ISSET(0, &rfds));
 
-		for (a = 0; a < strlen(abuf); ++a) {
+		for (a = 0; !IsEmptyStr(&abuf[a]); ++a) {
 			if ((abuf[a] == 27) && (abuf[a + 1] == '[')
 			    && (abuf[a + 2] == '?')) {
 				enable_color = 1;
@@ -1540,15 +1630,15 @@ void keyopt(char *buf) {
 	int i;
 
 	color(DIM_WHITE);
-	for (i=0; i<strlen(buf); ++i) {
+	for (i=0; !IsEmptyStr(&buf[i]); ++i) {
 		if (buf[i]=='<') {
-			scr_putc(buf[i]);
+			pprintf("%c", buf[i]);
 			color(BRIGHT_MAGENTA);
 		} else {
-			if (buf[i]=='>') {
+			if (buf[i]=='>'&& buf[i+1] != '>') {
 				color(DIM_WHITE);
 			}
-			scr_putc(buf[i]);
+			pprintf("%c", buf[i]);
 		}
 	}
 	color(DIM_WHITE);
@@ -1570,7 +1660,7 @@ char keymenu(char *menuprompt, char *menustring) {
 	choices = num_tokens(menustring, '|');
 
 	if (menuprompt != NULL) do_prompt = 1;
-	if (menuprompt != NULL) if (strlen(menuprompt)==0) do_prompt = 0;
+	if ((menuprompt != NULL) && (IsEmptyStr(menuprompt))) do_prompt = 0;
 
 	while (1) {
 		if (display_prompt) {
@@ -1579,12 +1669,12 @@ char keymenu(char *menuprompt, char *menustring) {
 			} 
 			else {
 				for (i=0; i<choices; ++i) {
-					extract(buf, menustring, i);
+					extract_token(buf, menustring, i, '|', sizeof buf);
 					keyopt(buf);
 					scr_printf(" ");
 				}
 			}
-			scr_printf(" -> ");
+			scr_printf("-> ");
 			display_prompt = 0;
 		}
 		ch = lkey();
@@ -1593,7 +1683,7 @@ char keymenu(char *menuprompt, char *menustring) {
 			scr_printf("\rOne of...                               ");
 			scr_printf("                                      \n");
 			for (i=0; i<choices; ++i) {
-				extract(buf, menustring, i);
+				extract_token(buf, menustring, i, '|', sizeof buf);
 				scr_printf("   ");
 				keyopt(buf);
 				scr_printf("\n");
@@ -1603,17 +1693,17 @@ char keymenu(char *menuprompt, char *menustring) {
 		}
 
 		for (i=0; i<choices; ++i) {
-			extract(buf, menustring, i);
-			for (c=1; c<strlen(buf); ++c) {
+			extract_token(buf, menustring, i, '|', sizeof buf);
+			for (c=1; !IsEmptyStr(&buf[c]); ++c) {
 				if ( (ch == tolower(buf[c]))
 				   && (buf[c-1]=='<')
 				   && (buf[c+1]=='>') ) {
-					for (a=0; a<strlen(buf); ++a) {
+					for (a=0; !IsEmptyStr(&buf[a]); ++a) {
 						if ( (a!=(c-1)) && (a!=(c+1))) {
 							scr_putc(buf[a]);
 						}
 					}
-					scr_printf("\n\n");
+					scr_printf("\n");
 					return ch;
 				}
 			}