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

diff --git a/citadel/commands.c b/citadel/commands.c
index 149f09581..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;
@@ -79,6 +96,7 @@ int rc_color_use_bg;
 int rc_prompt_control = 0;
 time_t rc_idle_threshold = (time_t)900;
 char rc_url_cmd[SIZ];
+char rc_open_cmd[SIZ];
 char rc_gotmail_cmd[SIZ];
 
 char *gl_string;
@@ -94,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 */
 
@@ -185,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;
@@ -199,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) {
@@ -244,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 */
@@ -258,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(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++;
 
@@ -294,14 +312,14 @@ 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);
@@ -361,10 +379,10 @@ static void really_do_keepalive(void) {
 	 */
 	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();
@@ -392,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;
 }
 
@@ -494,20 +525,27 @@ int inkey(void)
 		 * (There's a hole in the bucket...)
 		 */
 		a = scr_getc(SCR_BLOCK);
-		if (a == 127)
+		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)
+		if (a == ERR) {
 			logoff(NULL, 3);
+		}
 #endif
 #endif
 
@@ -559,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;
@@ -571,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;
@@ -586,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)) {
@@ -616,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);
@@ -627,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("*");
 		}
 	}
@@ -637,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);
@@ -680,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;
@@ -702,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);
 }
 
@@ -748,8 +787,8 @@ void load_command_set(void)
 	rc_force_mail_prompts = 0;
 	rc_ansi_color = 0;
 	rc_color_use_bg = 0;
-	rc_reply_extedit = 0;
 	strcpy(rc_url_cmd, "");
+	strcpy(rc_open_cmd, "");
 	strcpy(rc_gotmail_cmd, "");
 #ifdef HAVE_OPENSSL
 	rc_encrypt = RC_DEFAULT;
@@ -767,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");
@@ -781,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)) {
@@ -887,6 +925,9 @@ 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]);
 
@@ -898,14 +939,7 @@ void load_command_set(void)
 				rc_alt_semantics = 0;
 			}
 		}
-		if (!strncasecmp(buf, "reply_with_external_editor=", 27)) {
-			if (!strncasecmp(&buf[27], "yes", 3)) {
-				rc_reply_extedit = 1;
-			}
-			else {
-				rc_reply_extedit = 0;
-			}
-		}
+
 		if (!strncasecmp(buf, "cmd=", 4)) {
 			strcpy(buf, &buf[4]);
 
@@ -929,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] == ',')
@@ -963,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);
@@ -982,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] = '<';
@@ -1045,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);
 	}
@@ -1086,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)
@@ -1151,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");
 				}
@@ -1185,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;
@@ -1214,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;
@@ -1263,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;
@@ -1377,11 +1416,15 @@ int fmout(
 			old = '\n';
 			continue;
 		}
-		/* Are we looking at a nonprintable? */
+
+		/* 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++;
@@ -1541,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;
@@ -1566,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;
@@ -1587,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);
@@ -1617,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) {
@@ -1626,7 +1669,7 @@ 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(" ");
 				}
@@ -1640,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");
@@ -1650,12 +1693,12 @@ 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]);
 						}