extern char temp[];
extern char tempdir[];
-extern char *axdefs[7];
+extern char *axdefs[8];
extern long highest_msg_read;
extern long maxmsgnum;
extern unsigned room_flags;
{ /* 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;
if (r / 100 == 1) {
int a = 0;
- while (reg && strlen(reg) > 0) {
+ while (reg && !IsEmptyStr(reg)) {
- 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))
"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,
void updatels(CtdlIPC *ipc)
{ /* make all messages old in current room */
- char buf[SIZ];
+ char buf[256];
int r; /* IPC response code */
if (rc_alt_semantics) {
*/
void updatelsa(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
int r; /* IPC response code */
r = CtdlIPCSetLastRead(ipc, highest_msg_read, buf);
*/
void cli_upload(CtdlIPC *ipc)
{
- char flnm[SIZ];
+ char flnm[PATH_MAX];
char desc[151];
- char buf[SIZ];
- char tbuf[SIZ];
+ char buf[256];
+ char tbuf[256];
int r; /* IPC response code */
int a;
int fd;
if (haschar(tbuf, '/'))
extract_token(tbuf, flnm,
num_tokens(tbuf, '/') - 1,
- '/'
+ '/', sizeof tbuf
);
/* filename.1, filename.2, etc */
if (a > 0) {
*/
void cli_image_upload(CtdlIPC *ipc, char *keyname)
{
- char flnm[SIZ];
- char buf[SIZ];
+ char flnm[PATH_MAX];
+ char buf[256];
int r;
/* Can we upload this image? */
*/
void upload(CtdlIPC *ipc, int c)
{ /* c = upload mode */
- char flnm[SIZ];
+ char flnm[PATH_MAX];
char desc[151];
- char buf[SIZ];
+ char buf[256];
char tbuf[4096];
int xfer_pid;
int a, b;
else
newprompt("Enter filename: ", flnm, 15);
- for (a = 0; a < strlen(flnm); ++a)
+ for (a = 0; !IsEmptyStr(&flnm[a]); ++a)
if ((flnm[a] == '/') || (flnm[a] == '\\') || (flnm[a] == '>')
|| (flnm[a] == '?') || (flnm[a] == '*')
|| (flnm[a] == ';') || (flnm[a] == '&'))
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) {
int val_user(CtdlIPC *ipc, char *user, int do_validate)
{
int a;
- char cmd[SIZ];
- char buf[SIZ];
+ char cmd[256];
+ char buf[256];
char *resp = NULL;
int ax = 0;
char answer[2];
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)
scr_printf("%s\n", buf);
if (a == 11)
scr_printf("%s\n", buf);
- } while (strlen(resp));
+ } while (!IsEmptyStr(resp));
+
+/* TODODRW: discrepancy here. Parts of the code refer to axdefs[7] as the highest
+ * but most of it limits it to axdefs[6].
+ * Webcit limits to 6 as does the code here but there are 7 in axdefs.h
+ */
scr_printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
} else {
scr_printf("%s\n%s\n", user, &cmd[4]);
void validate(CtdlIPC *ipc)
{ /* validate new users */
- char cmd[SIZ];
- char buf[SIZ];
+ char cmd[256];
+ char buf[256];
int finished = 0;
int r; /* IPC response code */
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);
int a, b;
screen_reset();
- sttybbs(SB_RESTORE);
+ stty_ctdl(SB_RESTORE);
a = fork();
if (a == 0) {
signal(SIGINT, SIG_DFL);
do {
b = ka_wait(NULL);
} while ((a != b) && (a != (-1)));
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
}
void deletefile(CtdlIPC *ipc)
{
char filename[32];
- char buf[SIZ];
+ char buf[256];
newprompt("Filename: ", filename, 31);
- if (strlen(filename) == 0)
+ if (IsEmptyStr(filename))
return;
CtdlIPCDeleteFile(ipc, filename, buf);
err_printf("%s\n", buf);
*/
void netsendfile(CtdlIPC *ipc)
{
- char filename[32], destsys[20], buf[SIZ];
+ char filename[32], destsys[20], buf[256];
newprompt("Filename: ", filename, 31);
- if (strlen(filename) == 0)
+ if (IsEmptyStr(filename))
return;
newprompt("System to send to: ", destsys, 19);
CtdlIPCNetSendFile(ipc, filename, destsys, buf);
{
char filename[64];
char newroom[ROOMNAMELEN];
- char buf[SIZ];
+ char buf[256];
newprompt("Filename: ", filename, 63);
- if (strlen(filename) == 0)
+ if (IsEmptyStr(filename))
return;
newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
CtdlIPCMoveFile(ipc, filename, newroom, buf);
*/
void list_bio(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
char *resp = NULL;
int pos = 1;
int r; /* IPC response code */
pprintf("%s\n", buf);
return;
}
- while (strlen(resp)) {
- extract_token(buf, resp, 0, '\n');
+ while (resp && !IsEmptyStr(resp)) {
+ extract_token(buf, resp, 0, '\n', sizeof buf);
remove_token(resp, 0, '\n');
if ((pos + strlen(buf) + 5) > screenwidth) {
pprintf("\n");
*/
void read_bio(CtdlIPC *ipc)
{
- char who[SIZ];
- char buf[SIZ];
+ char who[256];
+ char buf[256];
char *resp = NULL;
int r; /* IPC response code */
pprintf("%s\n", buf);
return;
}
- while (strlen(resp)) {
- extract_token(buf, resp, 0, '\n');
+ while (!IsEmptyStr(resp)) {
+ 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 37
+#define NUM_CONFIGS 60
- char buf[SIZ];
- char sc[NUM_CONFIGS][SIZ];
+ char buf[256];
+ char sc[NUM_CONFIGS][256];
char *resp = NULL;
struct ExpirePolicy *site_expirepolicy = NULL;
struct ExpirePolicy *mbx_expirepolicy = NULL;
int a;
int logpages = 0;
int r; /* IPC response code */
+ int server_configs = 0;
/* Clear out the config buffers */
memset(&sc[0][0], 0, sizeof(sc));
/* Fetch the current config */
r = CtdlIPCGetSystemConfig(ipc, &resp, buf);
if (r / 100 == 1) {
- a = 0;
- while (strlen(resp)) {
- extract_token(buf, resp, 0, '\n');
- remove_token(resp, 0, '\n');
+ server_configs = num_tokens(resp, '\n');
+ for (a=0; a<server_configs; ++a) {
if (a < NUM_CONFIGS) {
- strcpy(&sc[a][0], buf);
+ extract_token(&sc[a][0], resp, a, '\n', sizeof sc[a]);
}
- ++a;
}
}
if (resp) free(resp);
strprompt("Node name", &sc[0][0], 15);
strprompt("Fully qualified domain name", &sc[1][0], 63);
strprompt("Human readable node name", &sc[2][0], 20);
- strprompt("Modem dialup number", &sc[3][0], 15);
+ strprompt("Telephone number", &sc[3][0], 15);
strprompt("Geographic location of this system", &sc[12][0], 31);
strprompt("Name of system administrator", &sc[13][0], 25);
strprompt("Paginator prompt", &sc[10][0], 79);
/* Security parameters */
snprintf(sc[7], sizeof sc[7], "%d", (boolprompt(
- "Require registration for new users",
- atoi(&sc[7][0]))));
+ "Require registration for new users",
+ atoi(&sc[7][0]))));
snprintf(sc[29], sizeof sc[29], "%d", (boolprompt(
- "Disable self-service user account creation",
- atoi(&sc[29][0]))));
+ "Disable self-service user account creation",
+ atoi(&sc[29][0]))));
strprompt("Initial access level for new users", &sc[6][0], 1);
strprompt("Access level required to create rooms", &sc[19][0], 1);
snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
- "Automatically give room aide privs to a user who creates a private room",
- atoi(&sc[4][0]))));
+ "Automatically give room aide privs to a user who creates a private room",
+ atoi(&sc[4][0]))));
snprintf(sc[8], sizeof sc[8], "%d", (boolprompt(
- "Automatically move problem user messages to twit room",
- atoi(&sc[8][0]))));
+ "Automatically move problem user messages to twit room",
+ atoi(&sc[8][0]))));
strprompt("Name of twit room", &sc[9][0], ROOMNAMELEN);
snprintf(sc[11], sizeof sc[11], "%d", (boolprompt(
- "Restrict Internet mail to only those with that privilege",
- atoi(&sc[11][0]))));
+ "Restrict Internet mail to only those with that privilege",
+ atoi(&sc[11][0]))));
snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
- "Allow Aides to Zap (forget) rooms",
- atoi(&sc[26][0]))));
+ "Allow Aides to Zap (forget) rooms",
+ atoi(&sc[26][0]))));
- if (strlen(&sc[18][0]) > 0) logpages = 1;
+ if (!IsEmptyStr(&sc[18][0])) logpages = 1;
else logpages = 0;
logpages = boolprompt("Log all pages", logpages);
if (logpages) {
sc[18][0] = 0;
}
+ /* Commented out because this setting isn't really appropriate to
+ * change while the server is running.
+ *
+ * snprintf(sc[52], sizeof sc[52], "%d", (boolprompt(
+ * "Use system authentication",
+ * atoi(&sc[52][0]))));
+ */
/* Server tuning */
strprompt("Maximum message length", &sc[20][0], 20);
strprompt("Minimum number of worker threads", &sc[21][0], 3);
strprompt("Maximum number of worker threads", &sc[22][0], 3);
+ snprintf(sc[43], sizeof sc[43], "%d", (boolprompt(
+ "Automatically delete committed database logs",
+ atoi(&sc[43][0]))));
+ 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);
+ strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5);
+ strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
/* This logic flips the question around, because it's one of those
* situations where 0=yes and 1=no
*/
a);
a = (a ? 0 : 1);
snprintf(sc[25], sizeof sc[25], "%d", a);
+ snprintf(sc[45], sizeof sc[45], "%d", (boolprompt(
+ "Allow unauthenticated SMTP clients to spoof my domains",
+ atoi(&sc[45][0]))));
+ snprintf(sc[57], sizeof sc[57], "%d", (boolprompt(
+ "Perform RBL checks at greeting instead of after RCPT",
+ atoi(&sc[57][0]))));
+ snprintf(sc[44], sizeof sc[44], "%d", (boolprompt(
+ "Instantly expunge deleted IMAP messages",
+ atoi(&sc[44][0]))));
/* 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);
+ a = boolprompt("Connect this Citadel to an external LDAP directory", a);
if (a) {
strprompt("Host name of LDAP server",
&sc[32][0], 127);
strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
strprompt("Hour to run purges (0-23)", &sc[31][0], 2);
+ snprintf(sc[42], sizeof sc[42], "%d", (boolprompt(
+ "Enable full text search index (warning: resource intensive)",
+ atoi(&sc[42][0]))));
+
+ snprintf(sc[46], sizeof sc[46], "%d", (boolprompt(
+ "Perform journaling of email messages",
+ atoi(&sc[46][0]))));
+ snprintf(sc[47], sizeof sc[47], "%d", (boolprompt(
+ "Perform journaling of non-email messages",
+ atoi(&sc[47][0]))));
+ if ( (atoi(&sc[46][0])) || (atoi(&sc[47][0])) ) {
+ strprompt("Email destination of journalized messages",
+ &sc[48][0], 127);
+ }
+
+ /* Funambol push stuff */
+ int yes_funambol = 0;
+ if (strlen(sc[53]) > 0) yes_funambol = 1;
+ yes_funambol = boolprompt("Connect to an external Funambol sync server", yes_funambol);
+ if (yes_funambol) {
+ strprompt("Funambol server (blank to disable)", &sc[53][0], 63);
+ strprompt("Funambol server port", &sc[54][0], 5);
+ strprompt("Funambol sync source", &sc[55][0], 63);
+ strprompt("Funambol authentication details (user:pass in Base64)", &sc[56][0],63);
+ }
+ else {
+ sc[53][0] = 0;
+ sc[54][0] = 0;
+ sc[55][0] = 0;
+ sc[56][0] = 0;
+ }
+
+ /* Master user account */
+ int yes_muacct = 0;
+ if (strlen(sc[58]) > 0) yes_muacct = 1;
+ yes_muacct = boolprompt("Enable a 'master user' account", yes_muacct);
+ if (yes_muacct) {
+ strprompt("Master user name", &sc[58][0], 31);
+ strprompt("Master user password", &sc[59][0], -31);
+ }
+ else {
+ strcpy(&sc[58][0], "");
+ strcpy(&sc[59][0], "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+ }
/* Save it */
scr_printf("Save this configuration? ");
}
}
+ if (site_expirepolicy) free(site_expirepolicy);
+ if (mbx_expirepolicy) free(mbx_expirepolicy);
}
keyopt(" <4> directory (Consult the Global Address Book)\n");
keyopt(" <5> SpamAssassin (Address of SpamAssassin server)\n");
keyopt(" <6> RBL (domain suffix of spam hunting RBL)\n");
+ keyopt(" <7> masq domains (Domains as which users are allowed to masquerade)\n");
sel = intprompt("Which one", 1, 1, 6);
switch(sel) {
case 1: strcpy(buf, "localhost");
return;
case 6: strcpy(buf, "rbl");
return;
+ case 7: strcpy(buf, "masqdomain");
+ return;
}
}
*/
void do_internet_configuration(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
char *resp = NULL;
int num_recs = 0;
char **recs = NULL;
r = CtdlIPCGetSystemConfigByType(ipc, INTERNETCFG, &resp, buf);
if (r / 100 == 1) {
- while (strlen(resp)) {
- extract_token(buf, resp, 0, '\n');
+ while (!IsEmptyStr(resp)) {
+ 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);
newprompt("Enter host name: ",
buf, 50);
striplt(buf);
- if (strlen(buf) > 0) {
+ if (!IsEmptyStr(buf)) {
++num_recs;
if (num_recs == 1)
recs = malloc(sizeof(char *));
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
+ free(resp);
break;
case 'q':
quitting = !modified || boolprompt(
int e_ex_code;
pid_t editor_pid;
int cksum;
- int b, i;
- char buf[SIZ];
- char instr[SIZ];
- char addr[SIZ];
+ int b, i, tokens;
+ char buf[1024];
+ char instr[1024];
+ char addr[1024];
FILE *tempfp;
FILE *changefp;
char *listing = NULL;
int r;
- if (strlen(editor_paths[0]) == 0) {
+ if (IsEmptyStr(editor_paths[0])) {
scr_printf("You must have an external editor configured in"
" order to use this function.\n");
return;
}
- snprintf(filename, sizeof filename, "%s.listedit", tmpnam(NULL));
- snprintf(changefile, sizeof changefile, "%s.listedit", tmpnam(NULL));
+ CtdlMakeTempFileName(filename, sizeof filename);
+ CtdlMakeTempFileName(changefile, sizeof changefile);
tempfp = fopen(filename, "w");
if (tempfp == NULL) {
r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
if (r / 100 == 1) {
- while(listing && strlen(listing)) {
- extract_token(buf, listing, 0, '\n');
+ while(listing && !IsEmptyStr(listing)) {
+ 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");
}
}
}
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 (file_checksum(filename) == cksum) {
- err_printf("*** Not saving changes.\n");
+ err_printf("*** No changes to save.\n");
e_ex_code = 1;
}
if (e_ex_code == 0) { /* Save changes */
changefp = fopen(changefile, "w");
+
+ /* Load all netconfig entries that are *not* of the type we are editing */
r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
if (r / 100 == 1) {
- while(listing && strlen(listing)) {
- extract_token(buf, listing, 0, '\n');
+ while(listing && !IsEmptyStr(listing)) {
+ 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);
}
free(listing);
listing = NULL;
}
+
+ /* ...and merge that with the data we just edited */
tempfp = fopen(filename, "r");
while (fgets(buf, sizeof buf, tempfp) != NULL) {
for (i=0; i<strlen(buf); ++i) {
if (buf[i] == '#') buf[i] = 0;
}
striplt(buf);
- if (strlen(buf) > 0) {
+ if (!IsEmptyStr(buf)) {
fprintf(changefp, "%s|%s\n", entrytype, buf);
}
}
int r;
r = CtdlIPCGetSystemConfigByType(ipc, IGNETCFG, &listing, buf);
- if (r / 100 == 1) while (*listing && strlen(listing)) {
- extract_token(buf, listing, 0, '\n');
+ if (r / 100 == 1) while (*listing && !IsEmptyStr(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
remove_token(listing, 0, '\n');
++num_recs;
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("Wrote %d records.\n", num_recs);
modified = 0;
}
+ free(listing);
break;
case 'q':
quitting = !modified || boolprompt(
int r;
r = CtdlIPCGetSystemConfigByType(ipc, FILTERLIST, &listing, buf);
- if (r / 100 == 1) while (*listing && strlen(listing)) {
- extract_token(buf, listing, 0, '\n');
+ if (r / 100 == 1) while (*listing && !IsEmptyStr(listing)) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
remove_token(listing, 0, '\n');
++num_recs;
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);
}
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
+ free(listing);
break;
case 'q':
quitting = !modified || boolprompt(
projects / citadel.git / blobdiff