* Bug fixes: Fix numerous char array size mismatches, signed/unsigned

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index cdb04f9e8cee9e6873e61a032edeab983ad4c0e3..4ae380c9433b67f7b8380affb7f0fc50f80d25e2 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -44,6 +44,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include "citadel.h"
+#include "citadel_ipc.h"
 #include "commands.h"
 #include "messages.h"
 #include "citadel_decls.h"
@@ -52,7 +53,6 @@
 #include "tools.h"
 #include "rooms.h"
 #include "client_chat.h"
-#include "citadel_ipc.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
@@ -80,6 +80,7 @@ int rc_prompt_control = 0;
 time_t rc_idle_threshold = (time_t)900;
 char urls[MAXURLS][SIZ];
 char rc_url_cmd[SIZ];
+char rc_gotmail_cmd[SIZ];
 
 char *gl_string;
 int next_lazy_cmd = 5;
@@ -87,6 +88,7 @@ int next_lazy_cmd = 5;
 int lines_printed = 0;         /* line count for paginator */
 extern int screenwidth, screenheight;
 extern int termn8;
+extern CtdlIPC *ipc_for_signal_handlers;       /* KLUDGE cover your eyes */
 
 struct citcmd *cmdlist = NULL;
 
@@ -140,7 +142,7 @@ char was_a_key_pressed(void) {
  * we are probably in the middle of a server operation and the NOOP command
  * would confuse everything.
  */
-int checkpagin(int lp, int pagin, int height)
+int checkpagin(int lp, unsigned int pagin, unsigned int height)
 {
        int thekey;
 
@@ -224,7 +226,7 @@ void print_express(void)
        }
        
        while (express_msgs != 0) {
-               r = CtdlIPCGetInstantMessage(&listing, buf);
+               r = CtdlIPCGetInstantMessage(ipc_for_signal_handlers, &listing, buf);
                if (r / 100 != 1)
                        return;
        
@@ -345,7 +347,6 @@ void set_keepalives(int s)
 
 static time_t idlet = 0;
 static void really_do_keepalive(void) {
-       char buf[1024];
        int r;                          /* IPC response code */
 
        time(&idlet);
@@ -354,7 +355,7 @@ static void really_do_keepalive(void) {
         * wait for a response.
         */
        if (keepalives_enabled == KA_YES) {
-               r = CtdlIPCNoop();
+               r = CtdlIPCNoop(ipc_for_signal_handlers);
                if (express_msgs > 0) {
                        if (ok_to_interrupt == 1) {
                                scr_printf("\r%64s\r", "");
@@ -371,7 +372,7 @@ static void really_do_keepalive(void) {
         */
        if ( (keepalives_enabled == KA_HALF)
           && (serv_info.serv_supports_qnop > 0) ) {
-               serv_puts("QNOP");
+               CtdlIPC_putline(ipc_for_signal_handlers, "QNOP");
        }
 }
 
@@ -646,7 +647,7 @@ int boolprompt(char *prompt, int prev_val)
        color(DIM_WHITE);
        scr_printf("%s ", prompt);
        color(DIM_MAGENTA);
-       scr_printf(" [");
+       scr_printf("[");
        color(BRIGHT_MAGENTA);
        scr_printf("%s", (prev_val ? "Yes" : "No"));
        color(DIM_MAGENTA);
@@ -736,6 +737,7 @@ void load_command_set(void)
        rc_force_mail_prompts = 0;
        rc_ansi_color = 0;
        strcpy(rc_url_cmd, "");
+       strcpy(rc_gotmail_cmd, "");
 #ifdef HAVE_OPENSSL
        rc_encrypt = RC_DEFAULT;
 #endif
@@ -763,7 +765,7 @@ void load_command_set(void)
        }
        if (ccfile == NULL) {
                perror("commands: cannot open citadel.rc");
-               logoff(errno);
+               logoff(NULL, 3);
        }
        while (fgets(buf, sizeof buf, ccfile) != NULL) {
                while ((strlen(buf) > 0) ? (isspace(buf[strlen(buf) - 1])) : 0)
@@ -775,7 +777,7 @@ void load_command_set(void)
                                rc_encrypt = RC_YES;
 #else
                                fprintf(stderr, "citadel.rc requires encryption support but citadel is not compiled with OpenSSL");
-                               logoff(1);
+                               logoff(NULL, 3);
 #endif
                        }
 #ifdef HAVE_OPENSSL
@@ -858,6 +860,9 @@ void load_command_set(void)
                if (!strncasecmp(buf, "urlcmd=", 7))
                        strcpy(rc_url_cmd, &buf[7]);
 
+               if (!strncasecmp(buf, "gotmailcmd=", 11))
+                       strcpy(rc_gotmail_cmd, &buf[11]);
+
                if (!strncasecmp(buf, "alternate_semantics=", 20)) {
                        if (!strncasecmp(&buf[11], "yes", 3))
                                rc_alt_semantics = 1;
@@ -1016,7 +1021,7 @@ int requires_string(struct citcmd *cptr, int ncomp)
  * This function returns an integer command number.  If the command prompts
  * for a string then it is placed in the supplied buffer.
  */
-int getcmd(char *argbuf)
+int getcmd(CtdlIPC *ipc, char *argbuf)
 {
        char cmdbuf[5];
        int cmdspaces[5];
@@ -1042,9 +1047,9 @@ int getcmd(char *argbuf)
                        enable_color = 0;
        }
        /* if we're running in idiot mode, display a cute little menu */
-       IFNEXPERT formout("mainmenu");
+       IFNEXPERT formout(ipc, "mainmenu");
 
-       print_express();        /* print express messages if there are any */
+       print_express();
        strcpy(argbuf, "");
        cmdpos = 0;
        for (a = 0; a < 5; ++a)
@@ -1187,8 +1192,8 @@ void sttybbs(int cmd)
                live.c_oflag = OPOST | ONLCR;
                live.c_lflag = ISIG | NOFLSH;
 
-               live.c_cc[VINTR] = (-1);
-               live.c_cc[VQUIT] = (-1);
+               live.c_cc[VINTR] = 0;
+               live.c_cc[VQUIT] = 0;
 
 #ifdef hpux
                live.c_cc[VMIN] = 0;
@@ -1247,9 +1252,9 @@ void sttybbs(int cmd)
 /*
  * display_help()  -  help file viewer
  */
-void display_help(char *name)
+void display_help(CtdlIPC *ipc, char *name)
 {
-       formout(name);
+       formout(ipc, name);
 }
 
 
@@ -1264,7 +1269,7 @@ int fmout(
        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 */
-       char subst)     /* nonzero if we should use hypertext mode */
+       int subst)      /* nonzero if we should use hypertext mode */
 {
        int a, b, c, old;
        int real = (-1);
@@ -1399,7 +1404,7 @@ FMTA:     while ((eof_flag == 0) && (strlen(buffer) < 126)) {
 
        /* keypress caught; drain the server */
 OOPS:  /* do {
-               serv_gets(aaa);
+               CtdlIPC_getline(ipc, aaa);
        } while (strcmp(aaa, "000")); */
 
 FMTEND:
@@ -1440,9 +1445,11 @@ void color(int colornum)
 #endif
                /* When switching to dim white, actually output an 'original
                 * pair' sequence -- this looks better on black-on-white
-                * terminals.
+                * terminals. - Changed to ORIGINAL_PAIR as this actually
+                * wound up looking horrible on black-on-white terminals, not
+                * to mention transparent terminals.
                 */
-               if (colornum == DIM_WHITE)
+               if (colornum == ORIGINAL_PAIR)
                        printf("\033[39;49m");
                else
                        printf("\033[3%d;40m", (colornum & 7));