* extract_token() now expects to be supplied with the size of the

[citadel.git] / citadel / citadel.c

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 7c09e40e28186910b3f1ad36008aebadb24cb663..ec5cdc574d83085c6c768783a18c6232c13d0812 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -220,11 +220,11 @@ void userlist(CtdlIPC *ipc, char *patn)
        pprintf("       User Name           Num  L  LastCall  Calls Posts\n");
        pprintf("------------------------- ----- - ---------- ----- -----\n");
        while (strlen(listing) > 0) {
-               extract_token(buf, listing, 0, '\n');
+               extract_token(buf, listing, 0, '\n', sizeof buf);
                remove_token(listing, 0, '\n');
 
                if (sigcaught == 0) {
-                   extract(fl, buf, 0);
+                   extract_token(fl, buf, 0, '|', sizeof fl);
                    if (pattern(fl, patn) >= 0) {
                        pprintf("%-25s ", fl);
                        pprintf("%5ld %d ", extract_long(buf, 2),
@@ -250,7 +250,7 @@ void userlist(CtdlIPC *ipc, char *patn)
  */
 void load_user_info(char *params)
 {
-       extract(fullname, params, 0);
+       extract_token(fullname, params, 0, '|', sizeof fullname);
        axlevel = extract_int(params, 1);
        timescalled = extract_int(params, 2);
        posted = extract_int(params, 3);
@@ -542,28 +542,32 @@ void gotonext(CtdlIPC *ipc)
 void forget_all_rooms_on(CtdlIPC *ipc, int ffloor)
 {
        char buf[SIZ];
-       struct march *flist, *fptr;
-       struct ctdlipcroom *room;       /* Ignored */
+       struct march *flist = NULL;
+       struct march *fptr = NULL;
+       struct ctdlipcroom *room = NULL;
        int r;                          /* IPC response code */
 
-       scr_printf("Forgetting all rooms on %s...\r", &floorlist[ffloor][0]);
+       scr_printf("Forgetting all rooms on %s...\n", &floorlist[ffloor][0]);
        scr_flush();
        remove_march("_FLOOR_", ffloor);
        r = CtdlIPCKnownRooms(ipc, AllAccessibleRooms, ffloor, &flist, buf);
        if (r / 100 != 1) {
-               scr_printf("%-72s\n", buf);
+               scr_printf("Error %d: %s\n", r, buf);
                return;
        }
        while (flist) {
                r = CtdlIPCGotoRoom(ipc, flist->march_name, "", &room, buf);
                if (r / 100 == 2) {
                        r = CtdlIPCForgetRoom(ipc, buf);
+                       if (r / 100 != 2) {
+                               scr_printf("Error %d: %s\n", r, buf);
+                       }
+
                }
                fptr = flist;
                flist = flist->next;
                free(fptr);
        }
-       scr_printf("%-72s\r", "");
 }
 
 
@@ -576,15 +580,15 @@ void gf_toroom(CtdlIPC *ipc, char *towhere, int mode)
 
        floor_being_left = curr_floor;
 
-       if (mode == GF_GOTO) {  /* <;G>oto mode */
+       if (mode == GF_GOTO) {          /* <;G>oto mode */
                updatels(ipc);
                dotgoto(ipc, towhere, 1, 0);
        }
-       if (mode == GF_SKIP) {  /* <;S>kip mode */
+       else if (mode == GF_SKIP) {     /* <;S>kip mode */
                dotgoto(ipc, towhere, 1, 0);
                remove_march("_FLOOR_", floor_being_left);
        }
-       if (mode == GF_ZAP) {   /* <;Z>ap mode */
+       else if (mode == GF_ZAP) {      /* <;Z>ap mode */
                dotgoto(ipc, towhere, 1, 0);
                remove_march("_FLOOR_", floor_being_left);
                forget_all_rooms_on(ipc, floor_being_left);
@@ -626,9 +630,10 @@ void gotofloor(CtdlIPC *ipc, char *towhere, int mode)
                return;
        }
        for (mptr = march; mptr != NULL; mptr = mptr->next) {
-               if ((mptr->march_floor) == tofloor)
+               if ((mptr->march_floor) == tofloor) {
                        gf_toroom(ipc, mptr->march_name, mode);
-               return;
+                       return;
+               }
        }
 
        /* Find first known room on the floor */
@@ -683,17 +688,18 @@ void gotofloor(CtdlIPC *ipc, char *towhere, int mode)
  */
 void forget_this_floor(CtdlIPC *ipc)
 {
-
        if (curr_floor == 0) {
                scr_printf("Can't forget this floor.\n");
                return;
        }
-       if (floorlist[0][0] == 0)
+       if (floorlist[0][0] == 0) {
                load_floorlist(ipc);
+       }
        scr_printf("Are you sure you want to forget all rooms on %s? ",
               &floorlist[(int) curr_floor][0]);
-       if (yesno() == 0)
+       if (yesno() == 0) {
                return;
+       }
 
        gf_toroom(ipc, "_BASEROOM_", GF_ZAP);
 }
@@ -842,8 +848,8 @@ char *SortOnlineUsers(char *listing) {
        /* Copy the list into a fixed-record-size array for sorting */
        for (i=0; i<rows; ++i) {
                memset(buf, 0, SIZ);
-               extract_token(buf, listing, i, '\n');
-               memcpy(&sortbuf[i*SIZ], buf, SIZ);
+               extract_token(buf, listing, i, '\n', sizeof buf);
+               memcpy(&sortbuf[i*SIZ], buf, (size_t)SIZ);
        }
 
        /* Do the sort */
@@ -894,14 +900,14 @@ void who_is_online(CtdlIPC *ipc, int longlist)
                        int isidle = 0;
                        
                        /* Get another line */
-                       extract_token(buf, listing, 0, '\n');
+                       extract_token(buf, listing, 0, '\n', sizeof buf);
                        remove_token(listing, 0, '\n');
 
-                       extract(username, buf, 1);
-                       extract(roomname, buf, 2);
-                       extract(fromhost, buf, 3);
-                       extract(clientsoft, buf, 4);
-                       extract(flags, buf, 7);
+                       extract_token(username, buf, 1, '|', sizeof username);
+                       extract_token(roomname, buf, 2, '|', sizeof roomname);
+                       extract_token(fromhost, buf, 3, '|', sizeof fromhost);
+                       extract_token(clientsoft, buf, 4, '|', sizeof clientsoft);
+                       extract_token(flags, buf, 7, '|', sizeof flags);
 
                        idletime = timenow - extract_long(buf, 5);
                        idlehours = idletime / 3600;
@@ -920,9 +926,9 @@ void who_is_online(CtdlIPC *ipc, int longlist)
                        }
 
                        if (longlist) {
-                               extract(actual_user, buf, 8);
-                               extract(actual_room, buf, 9);
-                               extract(actual_host, buf, 10);
+                               extract_token(actual_user, buf, 8, '|', sizeof actual_user);
+                               extract_token(actual_room, buf, 9, '|', sizeof actual_room);
+                               extract_token(actual_host, buf, 10, '|', sizeof actual_host);
 
                                pprintf("  Flags: %s\n", flags);
                                pprintf("Session: %d\n", extract_int(buf, 0));
@@ -1180,7 +1186,7 @@ int main(int argc, char **argv)
                                {
                                        sptr2++;
                                        *sptr2 = '\0';
-                                       strncpy(nonce, sptr, NONCE_SIZE);
+                                       strncpy(nonce, sptr, (size_t)NONCE_SIZE);
                                }
                }
 
@@ -1780,7 +1786,11 @@ NEWUSR:  if (strlen(rc_password) == 0) {
                                break;
 
                        case 25:
-                               edituser(ipc);
+                               edituser(ipc, 25);
+                               break;
+
+                       case 96:
+                               edituser(ipc, 96);
                                break;
 
                        case 8: