Patches from Matt with slight mod from me to do without strlen. Also modified lprintf...

[citadel.git] / citadel / citadel.c

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 920f06cc402b1ce1537991109cdfb85f2cf71d39..e9c979adbc91489e818998f93994dd4db53acbfc 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -517,6 +517,8 @@ void gotonext(CtdlIPC *ipc)
  */
                mptr = (struct march *) malloc(sizeof(struct march));
                mptr->next = NULL;
+               mptr->march_order = 0;
+               mptr->march_floor = 0;
                strcpy(mptr->march_name, "_BASEROOM_");
                if (march == NULL) {
                        march = mptr;
@@ -747,8 +749,18 @@ void  gotoroomstep(CtdlIPC *ipc, int direction, int mode)
        struct ctdlroomlisting *rs;
        int list_it;
        char rmname[ROOMNAMELEN];
-       int rmslot;
+       int rmslot = 0;
        int rmtotal;
+       struct ctdlroom *attr = NULL;
+
+       /* Fetch the existing room config */
+       r = CtdlIPCGetRoomAttributes(ipc, &attr, buf);
+       if (r / 100 != 2) {
+               scr_printf("%s\n", buf);
+               return;
+       }
+       strcpy (room_name , attr->QRname); 
+       free(attr);
 
        /* Ask the server for a room list */
        r = CtdlIPCKnownRooms(ipc, SubscribedRooms, (-1), &listing, buf);