Server changes to support upcoming overhaul of setup.c

[citadel.git] / citadel / textclient / tuiconfig.c

diff --git a/citadel/textclient/tuiconfig.c b/citadel/textclient/tuiconfig.c
index 415cd25dac6e27c286fc2c296a1948eaaa983c7c..df5c43bd5099c74e93b420696f0d6c04d2424ca2 100644 (file)
--- a/citadel/textclient/tuiconfig.c
+++ b/citadel/textclient/tuiconfig.c
@@ -1,6 +1,15 @@
 /*
  * Configuration screens that are part of the text mode client.
  *
+ * Copyright (c) 1987-2012 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ * 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.
  */
 
 #include <stdlib.h>
@@ -62,7 +71,7 @@ extern int screenwidth;
 void do_system_configuration(CtdlIPC *ipc)
 {
 
-#define NUM_CONFIGS 68
+       /* NUM_CONFIGS is now defined in citadel.h */
 
        char buf[256];
        char sc[NUM_CONFIGS][256];
@@ -355,8 +364,9 @@ void do_system_configuration(CtdlIPC *ipc)
        scr_printf("Save this configuration? ");
        if (yesno()) {
                r = 1;
-               for (a = 0; a < NUM_CONFIGS; a++)
+               for (a = 0; a < NUM_CONFIGS; a++) {
                        r += 1 + strlen(sc[a]);
+               }
                resp = (char *)calloc(1, r);
                if (!resp) {
                        scr_printf("Can't save config - out of memory!\n");
@@ -402,7 +412,7 @@ void get_inet_rec_type(CtdlIPC *ipc, char *buf) {
        keyopt(" <6> RBL            (domain suffix of spam hunting RBL)\n");
        keyopt(" <7> masq domains   (Domains as which users are allowed to masquerade)\n");
        keyopt(" <8> ClamAV         (Address of ClamAV clamd server)\n");
-       sel = intprompt("Which one", 1, 1, 7);
+       sel = intprompt("Which one", 1, 1, 8);
        switch(sel) {
                case 1: strcpy(buf, "localhost");
                        return;
@@ -434,7 +444,6 @@ void do_internet_configuration(CtdlIPC *ipc)
        int num_recs = 0;
        char **recs = NULL;
        char ch;
-       int badkey;
        int i, j;
        int quitting = 0;
        int modified = 0;
@@ -527,7 +536,7 @@ void do_internet_configuration(CtdlIPC *ipc)
                                        "Quit without saving", 0);
                                break;
                        default:
-                               badkey = 1;
+                               break;
                }
        } while (!quitting);
 
@@ -687,7 +696,6 @@ void do_ignet_configuration(CtdlIPC *ipc) {
        int num_recs = 0;
        char **recs = NULL;
        char ch;
-       int badkey;
        int i, j;
        int quitting = 0;
        int modified = 0;
@@ -797,7 +805,7 @@ void do_ignet_configuration(CtdlIPC *ipc) {
                                        "Quit without saving", 0);
                                break;
                        default:
-                               badkey = 1;
+                               break;
                }
        } while (!quitting);
 
@@ -817,7 +825,6 @@ void do_filterlist_configuration(CtdlIPC *ipc)
        int num_recs = 0;
        char **recs = NULL;
        char ch;
-       int badkey;
        int i, j;
        int quitting = 0;
        int modified = 0;
@@ -922,7 +929,7 @@ void do_filterlist_configuration(CtdlIPC *ipc)
                                        "Quit without saving", 0);
                                break;
                        default:
-                               badkey = 1;
+                               break;
                }
        } while (!quitting);
 
@@ -944,7 +951,6 @@ void do_pop3client_configuration(CtdlIPC *ipc)
        int num_recs = 0;
        char **recs = NULL;
        char ch;
-       int badkey;
        int i, j;
        int quitting = 0;
        int modified = 0;
@@ -1090,7 +1096,7 @@ void do_pop3client_configuration(CtdlIPC *ipc)
                                        "Quit without saving", 0);
                                break;
                        default:
-                               badkey = 1;
+                               break;
                }
        } while (!quitting);
 
@@ -1114,7 +1120,6 @@ void do_rssclient_configuration(CtdlIPC *ipc)
        int num_recs = 0;
        char **recs = NULL;
        char ch;
-       int badkey;
        int i, j;
        int quitting = 0;
        int modified = 0;
@@ -1235,7 +1240,7 @@ void do_rssclient_configuration(CtdlIPC *ipc)
                                        "Quit without saving", 0);
                                break;
                        default:
-                               badkey = 1;
+                               break;
                }
        } while (!quitting);