* Tracing a problem with ;Z command

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index cb2686653292de50c7cac887463bda0ece0aef25..0b65812d866b6a02624a1ed032af1aef8a986302 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 626.11  2004/10/12 11:24:42  ajc
+ * Tracing a problem with ;Z command
+
  Revision 626.10  2004/10/12 02:48:11  ajc
  * Reworked shutdown sequence to avoid thread deadlock
 
@@ -6156,4 +6159,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 7c09e40e28186910b3f1ad36008aebadb24cb663..745272a306123889929c0ab5f8e51ae8699e4550 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -546,12 +546,12 @@ void forget_all_rooms_on(CtdlIPC *ipc, int ffloor)
        struct ctdlipcroom *room;       /* Ignored */
        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("%s\n", buf);
                return;
        }
        while (flist) {
@@ -563,7 +563,6 @@ void forget_all_rooms_on(CtdlIPC *ipc, int ffloor)
                flist = flist->next;
                free(fptr);
        }
-       scr_printf("%-72s\r", "");
 }
 
 
@@ -626,9 +625,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 +683,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);
 }