* Variable names, comments, documentation, etc... removed the acronym 'BBS'

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index d6e1b04b86b5a1a0c9dc502d053f45b05619d8df..8e0a44c31b79746c30b38d33245f64b4645a66f8 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -206,7 +206,7 @@ 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];
@@ -232,11 +232,11 @@ 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);
        
-               stamp = localtime(&timestamp);
+               localtime_r(&timestamp, &stamp);
 
                /* If the page is a Logoff Request, honor it. */
                if (flags & 2) {
@@ -258,17 +258,17 @@ void print_instant(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);
@@ -294,14 +294,14 @@ void print_instant(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);
@@ -506,8 +506,9 @@ int inkey(void)
 
 #ifndef DISABLE_CURSES
 #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
-               if (a == ERR)
+               if (a == ERR) {
                        logoff(NULL, 3);
+               }
 #endif
 #endif
 
@@ -767,7 +768,7 @@ void load_command_set(void)
                ccfile = fopen(buf, "r");
        }
        if (ccfile == NULL) {
-               snprintf(buf, sizeof buf, "%s/citadel.rc", BBSDIR);
+               snprintf(buf, sizeof buf, "%s/citadel.rc", CTDLDIR);
                ccfile = fopen(buf, "r");
        }
        if (ccfile == NULL) {
@@ -1214,13 +1215,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 +1264,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;
@@ -1626,7 +1627,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 +1641,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,7 +1651,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]=='<')