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

[citadel.git] / citadel / routines2.c

diff --git a/citadel/routines2.c b/citadel/routines2.c
index 66ff6d090fa2f468a88caafb55a1713b54c79f27..3d356289462cbc78696b625b2866802c3e3d0f82 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -90,16 +90,16 @@ void entregis(CtdlIPC *ipc)
 {                              /* register with name and address */
 
        char buf[SIZ];
-       char tmpname[SIZ];
-       char tmpaddr[SIZ];
-       char tmpcity[SIZ];
-       char tmpstate[SIZ];
-       char tmpzip[SIZ];
-       char tmpphone[SIZ];
+       char tmpname[30];
+       char tmpaddr[25];
+       char tmpcity[15];
+       char tmpstate[3];
+       char tmpzip[11];
+       char tmpphone[15];
        char tmpemail[SIZ];
-       char tmpcountry[SIZ];
-       char diruser[SIZ];
-       char dirnode[SIZ];
+       char tmpcountry[32];
+       char diruser[256];
+       char dirnode[256];
        char holdemail[SIZ];
        char *reg = NULL;
        int ok = 0;
@@ -120,25 +120,25 @@ void entregis(CtdlIPC *ipc)
 
                while (reg && strlen(reg) > 0) {
 
-                       extract_token(buf, reg, 0, '\n');
+                       extract_token(buf, reg, 0, '\n', sizeof buf);
                        remove_token(reg, 0, '\n');
 
                        if (a == 2)
-                               strcpy(tmpname, buf);
+                               safestrncpy(tmpname, buf, sizeof tmpname);
                        else if (a == 3)
-                               strcpy(tmpaddr, buf);
+                               safestrncpy(tmpaddr, buf, sizeof tmpaddr);
                        else if (a == 4)
-                               strcpy(tmpcity, buf);
+                               safestrncpy(tmpcity, buf, sizeof tmpcity);
                        else if (a == 5)
-                               strcpy(tmpstate, buf);
+                               safestrncpy(tmpstate, buf, sizeof tmpstate);
                        else if (a == 6)
-                               strcpy(tmpzip, buf);
+                               safestrncpy(tmpzip, buf, sizeof tmpzip);
                        else if (a == 7)
-                               strcpy(tmpphone, buf);
+                               safestrncpy(tmpphone, buf, sizeof tmpphone);
                        else if (a == 9)
-                               strcpy(tmpemail, buf);
+                               safestrncpy(tmpemail, buf, sizeof tmpemail);
                        else if (a == 10)
-                               strcpy(tmpcountry, buf);
+                               safestrncpy(tmpcountry, buf, sizeof tmpcountry);
                        ++a;
                }
        }
@@ -152,12 +152,12 @@ void entregis(CtdlIPC *ipc)
 
        do {
                ok = 1;
-               strcpy(holdemail, tmpemail);
+               safestrncpy(holdemail, tmpemail, sizeof holdemail);
                strprompt("Email address", tmpemail, 31);
                r = CtdlIPCDirectoryLookup(ipc, tmpemail, buf);
                if (r / 100 == 2) {
-                       extract_token(diruser, buf, 0, '@');
-                       extract_token(dirnode, buf, 1, '@');
+                       extract_token(diruser, buf, 0, '@', sizeof diruser);
+                       extract_token(dirnode, buf, 1, '@', sizeof dirnode);
                        striplt(diruser);
                        striplt(dirnode);
                        if ((strcasecmp(diruser, fullname))
@@ -169,13 +169,13 @@ void entregis(CtdlIPC *ipc)
                                        "It is already in use by %s @ %s.\n",
                                        diruser, dirnode);
                                ok = 0;
-                               strcpy(tmpemail, holdemail);
+                               safestrncpy(tmpemail, holdemail, sizeof tmpemail);
                        }
                }
        } while (ok == 0);
 
        /* now send the registration info back to the server */
-       reg = (char *)realloc(reg, 4096);       /* Overkill? */
+       reg = (char *)realloc(reg, SIZ);
        if (reg) {
                sprintf(reg, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
                        tmpname, tmpaddr, tmpcity, tmpstate,
@@ -259,7 +259,7 @@ void cli_upload(CtdlIPC *ipc)
                if (haschar(tbuf, '/'))
                        extract_token(tbuf, flnm,
                                num_tokens(tbuf, '/') - 1,
-                               '/'
+                               '/', sizeof tbuf
                        );
                /* filename.1, filename.2, etc */
                if (a > 0) {
@@ -345,7 +345,7 @@ void upload(CtdlIPC *ipc, int c)
                chdir(tempdir);
                switch (c) {
                case 0:
-                       sttybbs(0);
+                       stty_ctdl(0);
                        scr_printf("Receiving %s - press Ctrl-D to end.\n", flnm);
                        fp = fopen(flnm, "w");
                        do {
@@ -362,17 +362,17 @@ void upload(CtdlIPC *ipc, int c)
                        exit(0);
                case 1:
                        screen_reset();
-                       sttybbs(3);
+                       stty_ctdl(3);
                        execlp("rx", "rx", flnm, NULL);
                        exit(1);
                case 2:
                        screen_reset();
-                       sttybbs(3);
+                       stty_ctdl(3);
                        execlp("rb", "rb", NULL);
                        exit(1);
                case 3:
                        screen_reset();
-                       sttybbs(3);
+                       stty_ctdl(3);
                        execlp("rz", "rz", NULL);
                        exit(1);
                }
@@ -380,7 +380,7 @@ void upload(CtdlIPC *ipc, int c)
                do {
                        b = ka_wait(&a);
                } while ((b != xfer_pid) && (b != (-1)));
-       sttybbs(0);
+       stty_ctdl(0);
        screen_set();
 
        if (a != 0) {
@@ -425,7 +425,7 @@ int val_user(CtdlIPC *ipc, char *user, int do_validate)
        if (r / 100 == 1) {
                a = 0;
                do {
-                       extract_token(buf, resp, 0, '\n');
+                       extract_token(buf, resp, 0, '\n', sizeof buf);
                        remove_token(resp, 0, '\n');
                        ++a;
                        if (a == 1)
@@ -501,7 +501,7 @@ void validate(CtdlIPC *ipc)
                if (r / 100 == 2)
                        scr_printf("%s\n", cmd);
                if (r / 100 == 3) {
-                       extract(buf, cmd, 0);
+                       extract_token(buf, cmd, 0, '|', sizeof buf);
                        if (val_user(ipc, buf, 1) != 0) finished = 1;
                }
        } while (finished == 0);
@@ -512,7 +512,7 @@ void subshell(void)
        int a, b;
 
        screen_reset();
-       sttybbs(SB_RESTORE);
+       stty_ctdl(SB_RESTORE);
        a = fork();
        if (a == 0) {
                signal(SIGINT, SIG_DFL);
@@ -524,7 +524,7 @@ void subshell(void)
        do {
                b = ka_wait(NULL);
        } while ((a != b) && (a != (-1)));
-       sttybbs(0);
+       stty_ctdl(0);
        screen_set();
 }
 
@@ -593,7 +593,7 @@ void list_bio(CtdlIPC *ipc)
                return;
        }
        while (strlen(resp)) {
-               extract_token(buf, resp, 0, '\n');
+               extract_token(buf, resp, 0, '\n', sizeof buf);
                remove_token(resp, 0, '\n');
                if ((pos + strlen(buf) + 5) > screenwidth) {
                        pprintf("\n");
@@ -630,7 +630,7 @@ void read_bio(CtdlIPC *ipc)
                return;
        }
        while (strlen(resp)) {
-               extract_token(buf, resp, 0, '\n');
+               extract_token(buf, resp, 0, '\n', sizeof buf);
                remove_token(resp, 0, '\n');
                pprintf("%s\n", buf);
        }
@@ -644,7 +644,7 @@ void read_bio(CtdlIPC *ipc)
 void do_system_configuration(CtdlIPC *ipc)
 {
 
-#define NUM_CONFIGS 37
+#define NUM_CONFIGS 42
 
        char buf[SIZ];
        char sc[NUM_CONFIGS][SIZ];
@@ -663,7 +663,7 @@ void do_system_configuration(CtdlIPC *ipc)
        if (r / 100 == 1) {
                a = 0;
                while (strlen(resp)) {
-                       extract_token(buf, resp, 0, '\n');
+                       extract_token(buf, resp, 0, '\n', sizeof buf);
                        remove_token(resp, 0, '\n');
                        if (a < NUM_CONFIGS) {
                                strcpy(&sc[a][0], buf);
@@ -714,9 +714,6 @@ void do_system_configuration(CtdlIPC *ipc)
        snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
              "Allow Aides to Zap (forget) rooms",
                                                     atoi(&sc[26][0]))));
-       snprintf(sc[30], sizeof sc[30], "%d", (boolprompt(
-             "Allow system Aides access to user mailboxes",
-                                                    atoi(&sc[30][0]))));
 
        if (strlen(&sc[18][0]) > 0) logpages = 1;
        else logpages = 0;
@@ -737,9 +734,14 @@ void do_system_configuration(CtdlIPC *ipc)
        strprompt("Minimum number of worker threads", &sc[21][0], 3);
        strprompt("Maximum number of worker threads", &sc[22][0], 3);
 
+       strprompt("Server IP address (0.0.0.0 for 'any')", &sc[37][0], 15);
        strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
+       strprompt("POP3S server port (-1 to disable)", &sc[40][0], 5);
        strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
-       strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
+       strprompt("IMAPS server port (-1 to disable)", &sc[39][0], 5);
+       strprompt("SMTP MTA server port (-1 to disable)", &sc[24][0], 5);
+       strprompt("SMTP MSA server port (-1 to disable)", &sc[38][0], 5);
+       strprompt("SMTPS server port (-1 to disable)", &sc[41][0], 5);
 
        /* This logic flips the question around, because it's one of those
         * situations where 0=yes and 1=no
@@ -914,7 +916,7 @@ void do_internet_configuration(CtdlIPC *ipc)
        r = CtdlIPCGetSystemConfigByType(ipc, INTERNETCFG, &resp, buf);
        if (r / 100 == 1) {
                while (strlen(resp)) {
-                       extract_token(buf, resp, 0, '\n');
+                       extract_token(buf, resp, 0, '\n', sizeof buf);
                        remove_token(resp, 0, '\n');
                        ++num_recs;
                        if (num_recs == 1) recs = malloc(sizeof(char *));
@@ -934,10 +936,10 @@ void do_internet_configuration(CtdlIPC *ipc)
                for (i=0; i<num_recs; ++i) {
                color(DIM_WHITE);
                scr_printf("%3d ", i+1);
-               extract(buf, recs[i], 0);
+               extract_token(buf, recs[i], 0, '|', sizeof buf);
                color(BRIGHT_CYAN);
                scr_printf("%-50s ", buf);
-               extract(buf, recs[i], 1);
+               extract_token(buf, recs[i], 1, '|', sizeof buf);
                color(BRIGHT_MAGENTA);
                scr_printf("%-20s\n", buf);
                color(DIM_WHITE);
@@ -1019,7 +1021,7 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
        int e_ex_code;
        pid_t editor_pid;
        int cksum;
-       int b, i;
+       int b, i, tokens;
        char buf[SIZ];
        char instr[SIZ];
        char addr[SIZ];
@@ -1051,12 +1053,19 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
        r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
        if (r / 100 == 1) {
                while(listing && strlen(listing)) {
-                       extract_token(buf, listing, 0, '\n');
+                       extract_token(buf, listing, 0, '\n', sizeof buf);
                        remove_token(listing, 0, '\n');
-                       extract(instr, buf, 0);
+                       extract_token(instr, buf, 0, '|', sizeof instr);
                        if (!strcasecmp(instr, entrytype)) {
-                               extract(addr, buf, 1);
-                               fprintf(tempfp, "%s\n", addr);
+                               tokens = num_tokens(buf, '|');
+                               for (i=1; i<tokens; ++i) {
+                                       extract_token(addr, buf, i, '|', sizeof addr);
+                                       fprintf(tempfp, "%s", addr);
+                                       if (i < (tokens-1)) {
+                                               fprintf(tempfp, "|");
+                                       }
+                               }
+                               fprintf(tempfp, "\n");
                        }
                }
        }
@@ -1068,7 +1077,7 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
 
        e_ex_code = 1;  /* start with a failed exit code */
        screen_reset();
-       sttybbs(SB_RESTORE);
+       stty_ctdl(SB_RESTORE);
        editor_pid = fork();
        cksum = file_checksum(filename);
        if (editor_pid == 0) {
@@ -1083,7 +1092,7 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
                        b = ka_wait(&e_ex_code);
                } while ((b != editor_pid) && (b >= 0));
        editor_pid = (-1);
-       sttybbs(0);
+       stty_ctdl(0);
        screen_set();
        }
 
@@ -1097,9 +1106,9 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
                r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
                if (r / 100 == 1) {
                        while(listing && strlen(listing)) {
-                               extract_token(buf, listing, 0, '\n');
+                               extract_token(buf, listing, 0, '\n', sizeof buf);
                                remove_token(listing, 0, '\n');
-                               extract(instr, buf, 0);
+                               extract_token(instr, buf, 0, '|', sizeof instr);
                                if (strcasecmp(instr, entrytype)) {
                                        fprintf(changefp, "%s\n", buf);
                                }
@@ -1157,7 +1166,7 @@ void do_ignet_configuration(CtdlIPC *ipc) {
 
        r = CtdlIPCGetSystemConfigByType(ipc, IGNETCFG, &listing, buf);
        if (r / 100 == 1) while (*listing && strlen(listing)) {
-               extract_token(buf, listing, 0, '\n');
+               extract_token(buf, listing, 0, '\n', sizeof buf);
                remove_token(listing, 0, '\n');
 
                ++num_recs;
@@ -1185,16 +1194,16 @@ void do_ignet_configuration(CtdlIPC *ipc) {
                for (i=0; i<num_recs; ++i) {
                color(DIM_WHITE);
                scr_printf("%3d ", i+1);
-               extract(buf, recs[i], 0);
+               extract_token(buf, recs[i], 0, '|', sizeof buf);
                color(BRIGHT_CYAN);
                scr_printf("%-16s ", buf);
-               extract(buf, recs[i], 1);
+               extract_token(buf, recs[i], 1, '|', sizeof buf);
                color(BRIGHT_MAGENTA);
                scr_printf("%-18s ", buf);
-               extract(buf, recs[i], 2);
+               extract_token(buf, recs[i], 2, '|', sizeof buf);
                color(BRIGHT_CYAN);
                scr_printf("%-32s ", buf);
-               extract(buf, recs[i], 3);
+               extract_token(buf, recs[i], 3, '|', sizeof buf);
                color(BRIGHT_MAGENTA);
                scr_printf("%-3s\n", buf);
                color(DIM_WHITE);
@@ -1285,7 +1294,7 @@ void do_filterlist_configuration(CtdlIPC *ipc)
 
        r = CtdlIPCGetSystemConfigByType(ipc, FILTERLIST, &listing, buf);
        if (r / 100 == 1) while (*listing && strlen(listing)) {
-               extract_token(buf, listing, 0, '\n');
+               extract_token(buf, listing, 0, '\n', sizeof buf);
                remove_token(listing, 0, '\n');
 
                ++num_recs;
@@ -1313,16 +1322,16 @@ void do_filterlist_configuration(CtdlIPC *ipc)
                for (i=0; i<num_recs; ++i) {
                color(DIM_WHITE);
                scr_printf("%3d ", i+1);
-               extract(buf, recs[i], 0);
+               extract_token(buf, recs[i], 0, '|', sizeof buf);
                color(BRIGHT_CYAN);
                scr_printf("%-28s ", buf);
-               extract(buf, recs[i], 1);
+               extract_token(buf, recs[i], 1, '|', sizeof buf);
                color(BRIGHT_MAGENTA);
                scr_printf("%-28s ", buf);
-               extract(buf, recs[i], 2);
+               extract_token(buf, recs[i], 2, '|', sizeof buf);
                color(BRIGHT_CYAN);
                scr_printf("%-16s\n", buf);
-               extract(buf, recs[i], 3);
+               extract_token(buf, recs[i], 3, '|', sizeof buf);
                color(DIM_WHITE);
                }