centralized filename calculation

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index 758df4aa04a304ce356da10cad83e54416310b2b..d81f41ca7039a98a8610643c4085f25f6b619d5e 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -53,6 +53,7 @@
 #include "tools.h"
 #include "rooms.h"
 #include "client_chat.h"
+#include "citadel_dirs.c"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
@@ -232,8 +233,8 @@ void print_instant(void)
                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);
        
                localtime_r(&timestamp, &stamp);
@@ -749,7 +750,6 @@ 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_gotmail_cmd, "");
 #ifdef HAVE_OPENSSL
@@ -764,12 +764,10 @@ void load_command_set(void)
 
        ccfile = NULL;
        if (getenv("HOME") != NULL) {
-               snprintf(buf, sizeof buf, "%s/.citadelrc", getenv("HOME"));
-               ccfile = fopen(buf, "r");
+               ccfile = fopen(file_citadel_rc, "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");
@@ -899,14 +897,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]);
 
@@ -1215,13 +1206,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;
@@ -1264,8 +1255,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;
@@ -1627,7 +1618,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(" ");
                                }
@@ -1641,7 +1632,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");
@@ -1651,7 +1642,7 @@ char keymenu(char *menuprompt, char *menustring) {
                }
 
                for (i=0; i<choices; ++i) {
-                       extract(buf, menustring, i);
+                       extract_token(buf, menustring, i, '|', sizeof buf);
                        for (c=1; c<strlen(buf); ++c) {
                                if ( (ch == tolower(buf[c]))
                                   && (buf[c-1]=='<')