* Applied bugfix patches contributed by Vaggelis Tsirkas:

  * rooms.c: buffer overrun fix
  * room_ops.c: cmd_rdir() now behaves better when directory doesn't exist

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 448900d4f1a612dbce3e6c6ea7ef9e4eb94ab920..b23ab66a08650ad12aaebec71ac899d73ef32dc3 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 1.339  1999/07/30 22:20:19  ajc
+* Applied bugfix patches contributed by Vaggelis Tsirkas:
+  * rooms.c: buffer overrun fix
+  * room_ops.c: cmd_rdir() now behaves better when directory doesn't exist
+
 Revision 1.338  1999/07/30 03:32:24  ajc
 * Added strdoop(), a leak-checked version of strdup()
 * Small fixes to new API functions in msgbase.c
@@ -1146,4 +1151,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index bc93a1314e0e41153ee70adeac8a73c4b4fb1120..06ddfc7f4b7eb4eaed720a22cfb1b90e253813e4 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -882,9 +882,9 @@ void cmd_rdir(void)
        cprintf("%d %s|%s/files/%s\n",
        LISTING_FOLLOWS, config.c_fqdn, BBSDIR, CC->quickroom.QRdirname);
 
-       sprintf(buf, "cd %s/files/%s; ls >%s 2>/dev/null",
-               BBSDIR, CC->quickroom.QRdirname, CC->temp);
-       system(buf);
+        sprintf(buf, "ls %s/files/%s  >%s 2> /dev/null",
+                BBSDIR, CC->quickroom.QRdirname, CC->temp);
+        system(buf);
 
        sprintf(buf, "%s/files/%s/filedir", BBSDIR, CC->quickroom.QRdirname);
        fd = fopen(buf, "r");

diff --git a/citadel/rooms.c b/citadel/rooms.c
index 93dbce84f69197257e2eecf0a7e91731d416cbb1..d60c42a85f3d17c16fb4c0efd36440d628b4c53a 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -84,7 +84,7 @@ void load_floorlist(void) {
 
 void room_tree_list(struct roomlisting *rp) {
        static int c = 0;
-       char rmname[32];
+       char rmname[ROOMNAMELEN];
        int f;
 
        if (rp == NULL) {