*
*/
-#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <signal.h>
#include <pwd.h>
-#include <setjmp.h>
#include <errno.h>
#include <stdarg.h>
+#include "sysdep.h"
#include "citadel.h"
#include "citadel_ipc.h"
#include "citadel_decls.h"
#endif
#include "screen.h"
+/* work around solaris include files */
+#ifdef reg
+#undef reg
+#endif
+
extern char temp[];
extern char tempdir[];
extern char *axdefs[7];
{ /* 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;
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;
}
}
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))
- || (strcasecmp(dirnode, serv_info.serv_nodename))) {
+ || (strcasecmp(dirnode, ipc->ServInfo.nodename))) {
scr_printf(
"\nYou can't use %s as your address.\n",
tmpemail);
"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,
int r; /* IPC response code */
if (rc_alt_semantics) {
- if (maxmsgnum == highest_msg_read == 0) {
- /* err_printf("maxmsgnum == highest_msg_read == 0\n"); */
+ if (maxmsgnum == 0 && highest_msg_read == 0) {
return;
}
r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
maxmsgnum : highest_msg_read, buf);
} else {
- r = CtdlIPCSetLastRead(ipc, 0, buf);
+ r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+ maxmsgnum : highest_msg_read, buf);
+/* r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf); */
+/* This is a quick-and-dirty fix to all msgs becoming new in Mail>.
+ * It will need to be rethought when messages.c is rewritten.
+ */
}
if (r / 100 != 2)
scr_printf("%s\n", buf);
/* basename of filename */
strcpy(tbuf, flnm);
if (haschar(tbuf, '/'))
- strcpy(tbuf, strrchr(tbuf, '/'));
+ extract_token(tbuf, flnm,
+ num_tokens(tbuf, '/') - 1,
+ '/', sizeof tbuf
+ );
/* filename.1, filename.2, etc */
if (a > 0) {
- sprintf(buf + strlen(buf), ".%d", a);
+ sprintf(&tbuf[strlen(tbuf)], ".%d", a);
}
/* Try upload */
r = CtdlIPCFileUpload(ipc, tbuf, desc, flnm, progress, buf);
else
break;
++a;
- };
+ }
+ if (a > 0) scr_printf("Saved as '%s'\n", tbuf);
}
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 {
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);
}
do {
b = ka_wait(&a);
} while ((b != xfer_pid) && (b != (-1)));
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
if (a != 0) {
}
/*
- * validate a user
+ * validate a user (returns 0 for successful validation, nonzero if quitting)
*/
-void val_user(CtdlIPC *ipc, char *user, int do_validate)
+int val_user(CtdlIPC *ipc, char *user, int do_validate)
{
int a;
char cmd[SIZ];
char buf[SIZ];
char *resp = NULL;
int ax = 0;
+ char answer[2];
int r; /* IPC response code */
+ scr_printf("\n");
r = CtdlIPCGetUserRegistration(ipc, user, &resp, cmd);
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)
if (do_validate) {
/* now set the access level */
- ax = intprompt("Access level", ax, 0, 6);
- r = CtdlIPCValidateUser(ipc, user, ax, cmd);
- if (r / 100 != 2)
- scr_printf("%s\n", cmd);
+ while(1) {
+ sprintf(answer, "%d", ax);
+ strprompt("New access level (? for help, q to quit)",
+ answer, 1);
+ if ((answer[0] >= '0') && (answer[0] <= '6')) {
+ ax = atoi(answer);
+ r = CtdlIPCValidateUser(ipc, user, ax, cmd);
+ if (r / 100 != 2)
+ scr_printf("%s\n\n", cmd);
+ return(0);
+ }
+ if (tolower(answer[0]) == 'q') {
+ scr_printf("*** Aborted.\n\n");
+ return(1);
+ }
+ if (answer[0] == '?') {
+ scr_printf("Available access levels:\n");
+ for (a=0; a<7; ++a) {
+ scr_printf("%d - %s\n",
+ a, axdefs[a]);
+ }
+ }
+ }
}
- scr_printf("\n");
+ return(0);
}
if (r / 100 == 2)
scr_printf("%s\n", cmd);
if (r / 100 == 3) {
- extract(buf, cmd, 0);
- val_user(ipc, buf, 1);
+ extract_token(buf, cmd, 0, '|', sizeof buf);
+ if (val_user(ipc, buf, 1) != 0) finished = 1;
}
} while (finished == 0);
}
void subshell(void)
{
int a, b;
+
+ screen_reset();
+ stty_ctdl(SB_RESTORE);
a = fork();
if (a == 0) {
- screen_reset();
- sttybbs(SB_RESTORE);
signal(SIGINT, SIG_DFL);
signal(SIGQUIT, SIG_DFL);
execlp(getenv("SHELL"), getenv("SHELL"), NULL);
do {
b = ka_wait(NULL);
} while ((a != b) && (a != (-1)));
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
}
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");
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);
}
*/
void do_system_configuration(CtdlIPC *ipc)
{
+
+#define NUM_CONFIGS 42
+
char buf[SIZ];
- char sc[31][SIZ];
+ char sc[NUM_CONFIGS][SIZ];
char *resp = NULL;
- struct ExpirePolicy *expirepolicy = NULL;
+ struct ExpirePolicy *site_expirepolicy = NULL;
+ struct ExpirePolicy *mbx_expirepolicy = NULL;
int a;
int logpages = 0;
int r; /* IPC response code */
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 < 31) {
+ if (a < NUM_CONFIGS) {
strcpy(&sc[a][0], buf);
}
++a;
/* Fetch the expire policy (this will silently fail on old servers,
* resulting in "default" policy)
*/
- r = CtdlIPCGetMessageExpirationPolicy(ipc, 2, &expirepolicy, buf);
+ r = CtdlIPCGetMessageExpirationPolicy(ipc, 2, &site_expirepolicy, buf);
+ r = CtdlIPCGetMessageExpirationPolicy(ipc, 3, &mbx_expirepolicy, buf);
/* Identification parameters */
snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
"Allow Aides to Zap (forget) rooms",
atoi(&sc[26][0]))));
- snprintf(sc[30], sizeof sc[29], "%d", (boolprompt(
- "Allow system Aides access to user mailboxes",
- atoi(&sc[30][0]))));
if (strlen(&sc[18][0]) > 0) logpages = 1;
else logpages = 0;
strprompt("Minimum number of worker threads", &sc[21][0], 3);
strprompt("Maximum number of worker threads", &sc[22][0], 3);
- /* no longer applicable ... deprecated
- strprompt("Server-to-server networking password", &sc[15][0], 19);
- */
-
- strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
- strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
+ 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("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
+ */
+ a = atoi(sc[25]);
+ a = (a ? 0 : 1);
+ a = boolprompt("Correct forged From: lines during authenticated SMTP",
+ a);
+ a = (a ? 0 : 1);
+ snprintf(sc[25], sizeof sc[25], "%d", a);
+
+ /* LDAP settings */
+ if (ipc->ServInfo.supports_ldap) {
+ a = strlen(&sc[32][0]);
+ a = (a ? 1 : 0); /* Set only to 1 or 0 */
+ a = boolprompt("Connect this Citadel to an LDAP directory", a);
+ if (a) {
+ strprompt("Host name of LDAP server",
+ &sc[32][0], 127);
+ strprompt("Port number of LDAP service",
+ &sc[33][0], 5);
+ strprompt("Base DN", &sc[34][0], 255);
+ strprompt("Bind DN", &sc[35][0], 255);
+ strprompt("Password for bind DN", &sc[36][0], 255);
+ }
+ else {
+ strcpy(&sc[32][0], "");
+ }
+ }
/* Expiry settings */
strprompt("Default user purge time (days)", &sc[16][0], 5);
/* Angels and demons dancing in my head... */
do {
- snprintf(buf, sizeof buf, "%d", expirepolicy->expire_mode);
+ snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_mode);
strprompt("System default message expire policy (? for list)",
buf, 1);
if (buf[0] == '?') {
"3. Expire by message age\n");
}
} while ((buf[0] < '1') || (buf[0] > '3'));
- expirepolicy->expire_mode = buf[0] - '0';
+ site_expirepolicy->expire_mode = buf[0] - '0';
/* ...lunatics and monsters underneath my bed */
- if (expirepolicy->expire_mode == 2) {
- snprintf(buf, sizeof buf, "%d", expirepolicy->expire_value);
+ if (site_expirepolicy->expire_mode == 2) {
+ snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_value);
+ strprompt("Keep how many messages online?", buf, 10);
+ site_expirepolicy->expire_value = atol(buf);
+ }
+ if (site_expirepolicy->expire_mode == 3) {
+ snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_value);
+ strprompt("Keep messages for how many days?", buf, 10);
+ site_expirepolicy->expire_value = atol(buf);
+ }
+
+ /* Media messiahs preying on my fears... */
+ do {
+ snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_mode);
+ strprompt("Mailbox default message expire policy (? for list)",
+ buf, 1);
+ if (buf[0] == '?') {
+ scr_printf("\n"
+ "0. Go with the system default\n"
+ "1. Never automatically expire messages\n"
+ "2. Expire by message count\n"
+ "3. Expire by message age\n");
+ }
+ } while ((buf[0] < '0') || (buf[0] > '3'));
+ mbx_expirepolicy->expire_mode = buf[0] - '0';
+
+ /* ...Pop culture prophets playing in my ears */
+ if (mbx_expirepolicy->expire_mode == 2) {
+ snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_value);
strprompt("Keep how many messages online?", buf, 10);
- expirepolicy->expire_value = atol(buf);
+ mbx_expirepolicy->expire_value = atol(buf);
}
- if (expirepolicy->expire_mode == 3) {
- snprintf(buf, sizeof buf, "%d", expirepolicy->expire_value);
+ if (mbx_expirepolicy->expire_mode == 3) {
+ snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_value);
strprompt("Keep messages for how many days?", buf, 10);
- expirepolicy->expire_value = atol(buf);
+ mbx_expirepolicy->expire_value = atol(buf);
}
+
+ strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
+ strprompt("Hour to run purges (0-23)", &sc[31][0], 2);
+
/* Save it */
scr_printf("Save this configuration? ");
if (yesno()) {
r = 1;
- for (a = 0; a < 31; a++)
+ for (a = 0; a < NUM_CONFIGS; a++)
r += 1 + strlen(sc[a]);
resp = (char *)calloc(1, r);
if (!resp) {
err_printf("Can't save config - out of memory!\n");
logoff(ipc, 1);
}
- for (a = 0; a < 31; a++) {
+ for (a = 0; a < NUM_CONFIGS; a++) {
strcat(resp, sc[a]);
strcat(resp, "\n");
}
err_printf("%s\n", buf);
}
free(resp);
- r = CtdlIPCSetMessageExpirationPolicy(ipc, 2, expirepolicy, buf);
+
+ r = CtdlIPCSetMessageExpirationPolicy(ipc, 2, site_expirepolicy, buf);
+ if (r / 100 != 2) {
+ err_printf("%s\n", buf);
+ }
+
+ r = CtdlIPCSetMessageExpirationPolicy(ipc, 3, mbx_expirepolicy, buf);
if (r / 100 != 2) {
err_printf("%s\n", buf);
}
+
}
}
int badkey;
int i, j;
int quitting = 0;
+ int modified = 0;
int r;
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 *));
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);
&buf[strlen(buf)]);
recs[num_recs-1] = strdup(buf);
}
+ modified = 1;
break;
case 'd':
i = intprompt("Delete which one",
--num_recs;
for (j=i; j<num_recs; ++j)
recs[j] = recs[j+1];
+ modified = 1;
break;
case 's':
r = 1;
err_printf("Can't save config - out of memory!\n");
logoff(ipc, 1);
}
- for (i = 0; i < num_recs; i++) {
+ if (num_recs) for (i = 0; i < num_recs; i++) {
strcat(resp, recs[i]);
strcat(resp, "\n");
}
r = CtdlIPCSetSystemConfigByType(ipc, INTERNETCFG, resp, buf);
if (r / 100 != 4) {
err_printf("%s\n", buf);
+ } else {
+ scr_printf("Wrote %d records.\n", num_recs);
+ modified = 0;
}
- quitting = 1;
break;
case 'q':
- quitting = boolprompt(
+ quitting = !modified || boolprompt(
"Quit without saving", 0);
break;
default:
badkey = 1;
}
- } while (quitting == 0);
+ } while (!quitting);
if (recs != NULL) {
for (i=0; i<num_recs; ++i) free(recs[i]);
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];
FILE *tempfp;
FILE *changefp;
+ char *listing = NULL;
+ int r;
if (strlen(editor_paths[0]) == 0) {
scr_printf("You must have an external editor configured in"
fprintf(tempfp, "# Specify one per line.\n"
"\n\n");
- CtdlIPC_putline(ipc, "GNET");
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '1') {
- while(CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
- extract(instr, buf, 0);
+ r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
+ if (r / 100 == 1) {
+ while(listing && strlen(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
+ 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");
}
}
}
+ if (listing) {
+ free(listing);
+ listing = NULL;
+ }
fclose(tempfp);
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) {
b = ka_wait(&e_ex_code);
} while ((b != editor_pid) && (b >= 0));
editor_pid = (-1);
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
}
if (e_ex_code == 0) { /* Save changes */
changefp = fopen(changefile, "w");
- CtdlIPC_putline(ipc, "GNET");
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '1') {
- while(CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
- extract(instr, buf, 0);
+ r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
+ if (r / 100 == 1) {
+ while(listing && strlen(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
+ extract_token(instr, buf, 0, '|', sizeof instr);
if (strcasecmp(instr, entrytype)) {
fprintf(changefp, "%s\n", buf);
}
}
}
+ if (listing) {
+ free(listing);
+ listing = NULL;
+ }
tempfp = fopen(filename, "r");
while (fgets(buf, sizeof buf, tempfp) != NULL) {
for (i=0; i<strlen(buf); ++i) {
fclose(changefp);
/* now write it to the server... */
- CtdlIPC_putline(ipc, "SNET");
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '4') {
- changefp = fopen(changefile, "r");
- if (changefp != NULL) {
- while (fgets(buf, sizeof buf,
- changefp) != NULL) {
- buf[strlen(buf) - 1] = 0;
- CtdlIPC_putline(ipc, buf);
- }
- fclose(changefp);
+ changefp = fopen(changefile, "r");
+ if (changefp != NULL) {
+ listing = load_message_from_file(changefp);
+ if (listing) {
+ r = CtdlIPCSetRoomNetworkConfig(ipc, listing, buf);
+ free(listing);
+ listing = NULL;
}
- CtdlIPC_putline(ipc, "000");
+ fclose(changefp);
}
}
int badkey;
int i, j;
int quitting = 0;
-
+ int modified = 0;
+ char *listing = NULL;
+ int r;
+
+ r = CtdlIPCGetSystemConfigByType(ipc, IGNETCFG, &listing, buf);
+ if (r / 100 == 1) while (*listing && strlen(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
- snprintf(buf, sizeof buf, "CONF getsys|%s", IGNETCFG);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '1') while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
recs[num_recs-1] = malloc(SIZ);
strcpy(recs[num_recs-1], buf);
}
+ if (listing) free(listing);
do {
scr_printf("\n");
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);
}
+ scr_printf("\n");
ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
switch(ch) {
strprompt("Enter port number : ",
&buf[strlen(buf)-3], 5);
recs[num_recs-1] = strdup(buf);
+ modified = 1;
break;
case 'd':
i = intprompt("Delete which one",
--num_recs;
for (j=i; j<num_recs; ++j)
recs[j] = recs[j+1];
+ modified = 1;
break;
case 's':
- snprintf(buf, sizeof buf, "CONF putsys|%s", IGNETCFG);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '4') {
- for (i=0; i<num_recs; ++i) {
- CtdlIPC_putline(ipc, recs[i]);
- }
- CtdlIPC_putline(ipc, "000");
+ r = 1;
+ for (i = 0; i < num_recs; ++i)
+ r += 1 + strlen(recs[i]);
+ listing = (char*) calloc(1, r);
+ if (!listing) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
}
- else {
- scr_printf("%s\n", &buf[4]);
+ if (num_recs) for (i = 0; i < num_recs; ++i) {
+ strcat(listing, recs[i]);
+ strcat(listing, "\n");
+ }
+ r = CtdlIPCSetSystemConfigByType(ipc, IGNETCFG, listing, buf);
+ if (r / 100 != 4) {
+ scr_printf("%s\n", buf);
+ } else {
+ scr_printf("Wrote %d records.\n", num_recs);
+ modified = 0;
}
- quitting = 1;
break;
case 'q':
- quitting = boolprompt(
+ quitting = !modified || boolprompt(
"Quit without saving", 0);
break;
default:
badkey = 1;
}
- } while (quitting == 0);
+ } while (!quitting);
if (recs != NULL) {
for (i=0; i<num_recs; ++i) free(recs[i]);
int badkey;
int i, j;
int quitting = 0;
-
+ int modified = 0;
+ char *listing = NULL;
+ int r;
+
+ r = CtdlIPCGetSystemConfigByType(ipc, FILTERLIST, &listing, buf);
+ if (r / 100 == 1) while (*listing && strlen(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
- snprintf(buf, sizeof buf, "CONF getsys|%s", FILTERLIST);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '1') while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
recs[num_recs-1] = malloc(SIZ);
strcpy(recs[num_recs-1], buf);
}
+ if (listing) free(listing);
do {
scr_printf("\n");
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);
}
&buf[strlen(buf)], 16);
strcat(buf, "|");
recs[num_recs-1] = strdup(buf);
+ modified = 1;
break;
case 'd':
i = intprompt("Delete which one",
--num_recs;
for (j=i; j<num_recs; ++j)
recs[j] = recs[j+1];
+ modified = 1;
break;
case 's':
- snprintf(buf, sizeof buf, "CONF putsys|%s", FILTERLIST);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '4') {
- for (i=0; i<num_recs; ++i) {
- CtdlIPC_putline(ipc, recs[i]);
- }
- CtdlIPC_putline(ipc, "000");
+ r = 1;
+ for (i = 0; i < num_recs; ++i)
+ r += 1 + strlen(recs[i]);
+ listing = (char*) calloc(1, r);
+ if (!listing) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
}
- else {
- scr_printf("%s\n", &buf[4]);
+ if (num_recs) for (i = 0; i < num_recs; ++i) {
+ strcat(listing, recs[i]);
+ strcat(listing, "\n");
+ }
+ r = CtdlIPCSetSystemConfigByType(ipc, FILTERLIST, listing, buf);
+ if (r / 100 != 4) {
+ scr_printf("%s\n", buf);
+ } else {
+ scr_printf("Wrote %d records.\n", num_recs);
+ modified = 0;
}
- quitting = 1;
break;
case 'q':
- quitting = boolprompt(
+ quitting = !modified || boolprompt(
"Quit without saving", 0);
break;
default:
badkey = 1;
}
- } while (quitting == 0);
+ } while (!quitting);
if (recs != NULL) {
for (i=0; i<num_recs; ++i) free(recs[i]);
projects / citadel.git / blobdiff