X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=25d335220fd1eb5d4de9b82155873e84dbd58cd3;hb=63262a64633e72e4096aaeedda6950c02fb4d990;hp=340b99a38dd2b786383766152f32383c8b1fc4d4;hpb=a2a06e5d6767d0e45eeccf4032153764e8a5520f;p=citadel.git

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 340b99a38..25d335220 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -12,6 +12,7 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <string.h>
+#include <dirent.h>	/* for cmd_rdir to read contents of the directory */
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -27,18 +28,21 @@
 #include <limits.h>
 #include <errno.h>
 #include "citadel.h"
+#include <libcitadel.h>
 #include "server.h"
 #include "database.h"
 #include "config.h"
 #include "room_ops.h"
 #include "sysdep_decls.h"
 #include "support.h"
-#include "user_ops.h"
 #include "msgbase.h"
 #include "citserver.h"
 #include "control.h"
-#include "tools.h"
 #include "citadel_dirs.h"
+#include "threads.h"
+
+#include "ctdl_module.h"
+#include "user_ops.h"
 
 struct floor *floorcache[MAXFLOORS];
 
@@ -49,11 +53,11 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
 		int *result, int *view)
 {
 	int retval = 0;
-	struct visit vbuf;
+	visit vbuf;
 
 	/* for internal programs, always do everything */
 	if (((CC->internal_pgm)) && (roombuf->QRflags & QR_INUSE)) {
-		retval = (UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED);
+		retval = (UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED);
 		vbuf.v_view = 0;
 		goto SKIP_EVERYTHING;
 	}
@@ -63,7 +67,7 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
 
 	/* Force the properties of the Aide room */
 	if (!strcasecmp(roombuf->QRname, config.c_aideroom)) {
-		if (userbuf->axlevel >= 6) {
+		if (userbuf->axlevel >= AxAideU) {
 			retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED;
 		} else {
 			retval = 0;
@@ -79,7 +83,7 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
 
 	/* If this is a preferred users only room, check access level */
 	if (roombuf->QRflags & QR_PREFONLY) {
-		if (userbuf->axlevel < 5) {
+		if (userbuf->axlevel < AxPrefU) {
 			retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
 		}
 	}
@@ -123,8 +127,8 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
 		 * - It is a read-only room
 		 */
 		int post_allowed = 1;
-		if (CC->user.axlevel < 2) post_allowed = 0;
-		if ((CC->user.axlevel < 4) && (CC->room.QRflags & QR_NETWORK)) post_allowed = 0;
+		if (CC->user.axlevel < AxProbU) post_allowed = 0;
+		if ((CC->user.axlevel < AxNetU) && (CC->room.QRflags & QR_NETWORK)) post_allowed = 0;
 		if (roombuf->QRflags & QR_READONLY) post_allowed = 0;
 		if (post_allowed) {
 			retval = retval | UA_POSTALLOWED;
@@ -157,7 +161,7 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
 	}
 
 	/* Aides get access to all private rooms */
-	if ( (userbuf->axlevel >= 6)
+	if ( (userbuf->axlevel >= AxAideU)
 	   && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
 		if (vbuf.v_flags & V_FORGET) {
 			retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
@@ -170,16 +174,16 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
 	/* Aides can gain access to mailboxes as well, but they don't show
 	 * by default.
 	 */
-	if ( (userbuf->axlevel >= 6)
+	if ( (userbuf->axlevel >= AxAideU)
 	   && (roombuf->QRflags & QR_MAILBOX) ) {
 		retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
 	}
 
 	/* Aides and Room Aides have admin privileges */
-	if ( (userbuf->axlevel >= 6)
+	if ( (userbuf->axlevel >= AxAideU)
 	   || (userbuf->usernum == roombuf->QRroomaide)
 	   ) {
-		retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED;
+		retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED | UA_POSTALLOWED;
 	}
 
 NEWMSG:	/* By the way, we also check for the presence of new messages */
@@ -218,19 +222,23 @@ void room_sanity_check(struct ctdlroom *qrbuf)
 
 
 /*
- * getroom()  -  retrieve room data from disk
+ * CtdlGetRoom()  -  retrieve room data from disk
  */
-int getroom(struct ctdlroom *qrbuf, char *room_name)
+int CtdlGetRoom(struct ctdlroom *qrbuf, char *room_name)
 {
 	struct cdbdata *cdbqr;
 	char lowercase_name[ROOMNAMELEN];
 	char personal_lowercase_name[ROOMNAMELEN];
-	int a;
+	char *dptr, *sptr, *eptr;
 
-	for (a = 0; room_name[a] && a < sizeof lowercase_name - 1; ++a) {
-		lowercase_name[a] = tolower(room_name[a]);
+	dptr = lowercase_name;
+	sptr = room_name;
+	eptr = (dptr + (sizeof lowercase_name - 1));
+	while (!IsEmptyStr(sptr) && (dptr < eptr)){
+		*dptr = tolower(*sptr);
+		sptr++; dptr++;
 	}
-	lowercase_name[a] = 0;
+	*dptr = '\0';
 
 	memset(qrbuf, 0, sizeof(struct ctdlroom));
 
@@ -262,12 +270,12 @@ int getroom(struct ctdlroom *qrbuf, char *room_name)
 }
 
 /*
- * lgetroom()  -  same as getroom() but locks the record (if supported)
+ * CtdlGetRoomLock()  -  same as getroom() but locks the record (if supported)
  */
-int lgetroom(struct ctdlroom *qrbuf, char *room_name)
+int CtdlGetRoomLock(struct ctdlroom *qrbuf, char *room_name)
 {
 	register int retval;
-	retval = getroom(qrbuf, room_name);
+	retval = CtdlGetRoom(qrbuf, room_name);
 	if (retval == 0) begin_critical_section(S_ROOMS);
 	return(retval);
 }
@@ -280,28 +288,36 @@ int lgetroom(struct ctdlroom *qrbuf, char *room_name)
 void b_putroom(struct ctdlroom *qrbuf, char *room_name)
 {
 	char lowercase_name[ROOMNAMELEN];
-	int a;
+	char *aptr, *bptr;
+	long len;
 
-	for (a = 0; a <= strlen(room_name); ++a) {
-		lowercase_name[a] = tolower(room_name[a]);
+	aptr = room_name;
+	bptr = lowercase_name;
+	while (!IsEmptyStr(aptr))
+	{
+		*bptr = tolower(*aptr);
+		aptr++;
+		bptr++;
 	}
+	*bptr='\0';
 
+	len = bptr - lowercase_name;
 	if (qrbuf == NULL) {
 		cdb_delete(CDB_ROOMS,
-			   lowercase_name, strlen(lowercase_name));
+			   lowercase_name, len);
 	} else {
 		time(&qrbuf->QRmtime);
 		cdb_store(CDB_ROOMS,
-			  lowercase_name, strlen(lowercase_name),
+			  lowercase_name, len,
 			  qrbuf, sizeof(struct ctdlroom));
 	}
 }
 
 
 /* 
- * putroom()  -  store room data to disk
+ * CtdlPutRoom()  -  store room data to disk
  */
-void putroom(struct ctdlroom *qrbuf) {
+void CtdlPutRoom(struct ctdlroom *qrbuf) {
 	b_putroom(qrbuf, qrbuf->QRname);
 }
 
@@ -316,22 +332,78 @@ void b_deleteroom(char *room_name) {
 
 
 /*
- * lputroom()  -  same as putroom() but unlocks the record (if supported)
+ * CtdlPutRoomLock()  -  same as CtdlPutRoom() but unlocks the record (if supported)
  */
-void lputroom(struct ctdlroom *qrbuf)
+void CtdlPutRoomLock(struct ctdlroom *qrbuf)
 {
 
-	putroom(qrbuf);
+	CtdlPutRoom(qrbuf);
 	end_critical_section(S_ROOMS);
 
 }
 
 /****************************************************************************/
 
+
+/*
+ * CtdlGetFloorByName()  -  retrieve the number of the named floor
+ * return < 0 if not found else return floor number
+ */
+int CtdlGetFloorByName(const char *floor_name)
+{
+	int a;
+	struct floor *flbuf = NULL;
+
+	for (a = 0; a < MAXFLOORS; ++a) {
+		flbuf = CtdlGetCachedFloor(a);
+
+		/* check to see if it already exists */
+		if ((!strcasecmp(flbuf->f_name, floor_name))
+		    && (flbuf->f_flags & F_INUSE)) {
+			return a;
+		}
+	}
+	return -1;
+}
+
+
+
+/*
+ * CtdlGetFloorByNameLock()  -  retrieve floor number for given floor and lock the floor list.
+ */
+int CtdlGetFloorByNameLock(const char *floor_name)
+{
+	begin_critical_section(S_FLOORTAB);
+	return CtdlGetFloorByName(floor_name);
+}
+
+
+
+/*
+ * CtdlGetAvailableFloor()  -  Return number of first unused floor
+ * return < 0 if none available
+ */
+int CtdlGetAvailableFloor(void)
+{
+	int a;
+	struct floor *flbuf = NULL;
+
+	for (a = 0; a < MAXFLOORS; a++) {
+		flbuf = CtdlGetCachedFloor(a);
+
+		/* check to see if it already exists */
+		if ((flbuf->f_flags & F_INUSE) == 0) {
+			return a;
+		}
+	}
+	return -1;
+}
+
+
 /*
- * getfloor()  -  retrieve floor data from disk
+ * CtdlGetFloor()  -  retrieve floor data from disk
  */
-void getfloor(struct floor *flbuf, int floor_num)
+void CtdlGetFloor(struct floor *flbuf, int floor_num)
 {
 	struct cdbdata *cdbfl;
 
@@ -354,22 +426,22 @@ void getfloor(struct floor *flbuf, int floor_num)
 }
 
 /*
- * lgetfloor()  -  same as getfloor() but locks the record (if supported)
+ * lgetfloor()  -  same as CtdlGetFloor() but locks the record (if supported)
  */
 void lgetfloor(struct floor *flbuf, int floor_num)
 {
 
 	begin_critical_section(S_FLOORTAB);
-	getfloor(flbuf, floor_num);
+	CtdlGetFloor(flbuf, floor_num);
 }
 
 
 /*
- * cgetfloor()  -  Get floor record from *cache* (loads from disk if needed)
+ * CtdlGetCachedFloor()  -  Get floor record from *cache* (loads from disk if needed)
  *    
  * This is strictly a performance hack.
  */
-struct floor *cgetfloor(int floor_num) {
+struct floor *CtdlGetCachedFloor(int floor_num) {
 	static int initialized = 0;
 	int i;
 	int fetch_new = 0;
@@ -389,7 +461,7 @@ struct floor *cgetfloor(int floor_num) {
 
 	if (fetch_new) {
 		fl = malloc(sizeof(struct floor));
-		getfloor(fl, floor_num);
+		CtdlGetFloor(fl, floor_num);
 		begin_critical_section(S_FLOORCACHE);
 		if (floorcache[floor_num] != NULL) {
 			free(floorcache[floor_num]);
@@ -404,9 +476,9 @@ struct floor *cgetfloor(int floor_num) {
 
 
 /*
- * putfloor()  -  store floor data on disk
+ * CtdlPutFloor()  -  store floor data on disk
  */
-void putfloor(struct floor *flbuf, int floor_num)
+void CtdlPutFloor(struct floor *flbuf, int floor_num)
 {
 	/* If we've cached this, clear it out, 'cuz it's WRONG now! */
 	begin_critical_section(S_FLOORCACHE);
@@ -422,22 +494,33 @@ void putfloor(struct floor *flbuf, int floor_num)
 }
 
 
+
 /*
- * lputfloor()  -  same as putfloor() but unlocks the record (if supported)
+ * CtdlPutFloorLock()  -  same as CtdlPutFloor() but unlocks the record (if supported)
  */
-void lputfloor(struct floor *flbuf, int floor_num)
+void CtdlPutFloorLock(struct floor *flbuf, int floor_num)
 {
 
-	putfloor(flbuf, floor_num);
+	CtdlPutFloor(flbuf, floor_num);
 	end_critical_section(S_FLOORTAB);
 
 }
 
 
+
+/*
+ * lputfloor()  -  same as CtdlPutFloor() but unlocks the record (if supported)
+ */
+void lputfloor(struct floor *flbuf, int floor_num)
+{
+	CtdlPutFloorLock(flbuf, floor_num);
+}
+
+
 /* 
  *  Traverse the room file...
  */
-void ForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
+void CtdlForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
 		void *in_data)
 {
 	struct ctdlroom qrbuf;
@@ -479,6 +562,15 @@ void delete_msglist(struct ctdlroom *whichroom)
 
 
 
+/*
+ * Message pointer compare function for sort_msglist()
+ */
+int sort_msglist_cmp(const void *m1, const void *m2) {
+	if ((*(const long *)m1) > (*(const long *)m2)) return(1);
+	if ((*(const long *)m1) < (*(const long *)m2)) return(-1);
+	return(0);
+}
+
 
 /*
  * sort message pointers
@@ -486,29 +578,19 @@ void delete_msglist(struct ctdlroom *whichroom)
  */
 int sort_msglist(long listptrs[], int oldcount)
 {
-	int a, b;
-	long hold1, hold2;
 	int numitems;
 
 	numitems = oldcount;
-	if (numitems < 2)
+	if (numitems < 2) {
 		return (oldcount);
+	}
 
 	/* do the sort */
-	for (a = numitems - 2; a >= 0; --a) {
-		for (b = 0; b <= a; ++b) {
-			if (listptrs[b] > (listptrs[b + 1])) {
-				hold1 = listptrs[b];
-				hold2 = listptrs[b + 1];
-				listptrs[b] = hold2;
-				listptrs[b + 1] = hold1;
-			}
-		}
-	}
+	qsort(listptrs, numitems, sizeof(long), sort_msglist_cmp);
 
 	/* and yank any nulls */
 	while ((numitems > 0) && (listptrs[0] == 0L)) {
-		memcpy(&listptrs[0], &listptrs[1],
+		memmove(&listptrs[0], &listptrs[1],
 		       (sizeof(long) * (numitems - 1)));
 		--numitems;
 	}
@@ -520,7 +602,7 @@ int sort_msglist(long listptrs[], int oldcount)
 /*
  * Determine whether a given room is non-editable.
  */
-int is_noneditable(struct ctdlroom *qrbuf)
+int CtdlIsNonEditable(struct ctdlroom *qrbuf)
 {
 
 	/* Mail> rooms are non-editable */
@@ -593,13 +675,13 @@ void cmd_lrms(char *argbuf)
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 
-	if (getuser(&CC->user, CC->curr_user)) {
+	if (CtdlGetUser(&CC->user, CC->curr_user)) {
 		cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
 	cprintf("%d Accessible rooms:\n", LISTING_FOLLOWS);
 
-	ForEachRoom(cmd_lrms_backend, &FloorBeingSearched);
+	CtdlForEachRoom(cmd_lrms_backend, &FloorBeingSearched);
 	cprintf("000\n");
 }
 
@@ -631,13 +713,13 @@ void cmd_lkra(char *argbuf)
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 	
-	if (getuser(&CC->user, CC->curr_user)) {
+	if (CtdlGetUser(&CC->user, CC->curr_user)) {
 		cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
 	cprintf("%d Known rooms:\n", LISTING_FOLLOWS);
 
-	ForEachRoom(cmd_lkra_backend, &FloorBeingSearched);
+	CtdlForEachRoom(cmd_lkra_backend, &FloorBeingSearched);
 	cprintf("000\n");
 }
 
@@ -667,7 +749,7 @@ void cmd_lprm(char *argbuf)
 
 	cprintf("%d Publiic rooms:\n", LISTING_FOLLOWS);
 
-	ForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
+	CtdlForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
 	cprintf("000\n");
 }
 
@@ -700,13 +782,13 @@ void cmd_lkrn(char *argbuf)
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 	
-	if (getuser(&CC->user, CC->curr_user)) {
+	if (CtdlGetUser(&CC->user, CC->curr_user)) {
 		cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
 	cprintf("%d Rooms w/ new msgs:\n", LISTING_FOLLOWS);
 
-	ForEachRoom(cmd_lkrn_backend, &FloorBeingSearched);
+	CtdlForEachRoom(cmd_lkrn_backend, &FloorBeingSearched);
 	cprintf("000\n");
 }
 
@@ -739,13 +821,13 @@ void cmd_lkro(char *argbuf)
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 	
-	if (getuser(&CC->user, CC->curr_user)) {
+	if (CtdlGetUser(&CC->user, CC->curr_user)) {
 		cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
 	cprintf("%d Rooms w/o new msgs:\n", LISTING_FOLLOWS);
 
-	ForEachRoom(cmd_lkro_backend, &FloorBeingSearched);
+	CtdlForEachRoom(cmd_lkro_backend, &FloorBeingSearched);
 	cprintf("000\n");
 }
 
@@ -778,13 +860,13 @@ void cmd_lzrm(char *argbuf)
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 	
-	if (getuser(&CC->user, CC->curr_user)) {
+	if (CtdlGetUser(&CC->user, CC->curr_user)) {
 		cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
 	cprintf("%d Zapped rooms:\n", LISTING_FOLLOWS);
 
-	ForEachRoom(cmd_lzrm_backend, &FloorBeingSearched);
+	CtdlForEachRoom(cmd_lzrm_backend, &FloorBeingSearched);
 	cprintf("000\n");
 }
 
@@ -794,7 +876,7 @@ void cmd_lzrm(char *argbuf)
  * or access control is done here -- the caller should make sure that the
  * specified room exists and is ok to access.
  */
-void usergoto(char *where, int display_result, int transiently,
+void CtdlUserGoto(char *where, int display_result, int transiently,
 		int *retmsgs, int *retnew)
 {
 	int a;
@@ -805,7 +887,7 @@ void usergoto(char *where, int display_result, int transiently,
 	int rmailflag;
 	int raideflag;
 	int newmailcount = 0;
-	struct visit vbuf;
+	visit vbuf;
 	char truncated_roomname[ROOMNAMELEN];
         struct cdbdata *cdbfr;
 	long *msglist = NULL;
@@ -823,7 +905,7 @@ void usergoto(char *where, int display_result, int transiently,
 	 */
 	if (where != NULL) {
 		safestrncpy(CC->room.QRname, where, sizeof CC->room.QRname);
-		getroom(&CC->room, where);
+		CtdlGetRoom(&CC->room, where);
 	}
 
 	/* Take care of all the formalities. */
@@ -858,7 +940,7 @@ void usergoto(char *where, int display_result, int transiently,
         cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
         if (cdbfr != NULL) {
         	msglist = (long *) cdbfr->ptr;
-		cdbfr->ptr = NULL;	/* usergoto() now owns this memory */
+		cdbfr->ptr = NULL;	/* CtdlUserGoto() now owns this memory */
         	num_msgs = cdbfr->len / sizeof(long);
         	cdb_free(cdbfr);
 	}
@@ -902,7 +984,7 @@ void usergoto(char *where, int display_result, int transiently,
 		rmailflag = 0;
 
 	if ((CC->room.QRroomaide == CC->user.usernum)
-	    || (CC->user.axlevel >= 6))
+	    || (CC->user.axlevel >= AxAideU))
 		raideflag = 1;
 	else
 		raideflag = 0;
@@ -919,7 +1001,7 @@ void usergoto(char *where, int display_result, int transiently,
 
 	if (retmsgs != NULL) *retmsgs = total_messages;
 	if (retnew != NULL) *retnew = new_messages;
-	lprintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
+	CtdlLogPrintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
 		CC->room.QRname,
 		new_messages, total_messages
 	);
@@ -962,6 +1044,9 @@ void convert_room_name_macros(char *towhere, size_t maxlen) {
 	else if (!strcasecmp(towhere, "_TRASH_")) {
 		safestrncpy(towhere, USERTRASHROOM, maxlen);
 	}
+	else if (!strcasecmp(towhere, "_DRAFTS_")) {
+		safestrncpy(towhere, USERDRAFTROOM, maxlen);
+	}
 	else if (!strcasecmp(towhere, "_BITBUCKET_")) {
 		safestrncpy(towhere, config.c_twitroom, maxlen);
 	}
@@ -1000,7 +1085,7 @@ void cmd_goto(char *gargs)
 	extract_token(password, gargs, 1, '|', sizeof password);
 	transiently = extract_int(gargs, 2);
 
-	getuser(&CC->user, CC->curr_user);
+	CtdlGetUser(&CC->user, CC->curr_user);
 
 	/*
 	 * Handle some of the macro named rooms
@@ -1008,13 +1093,13 @@ void cmd_goto(char *gargs)
 	convert_room_name_macros(towhere, sizeof towhere);
 
 	/* First try a regular match */
-	c = getroom(&QRscratch, towhere);
+	c = CtdlGetRoom(&QRscratch, towhere);
 
 	/* Then try a mailbox name match */
 	if (c != 0) {
-		MailboxName(augmented_roomname, sizeof augmented_roomname,
+		CtdlMailboxName(augmented_roomname, sizeof augmented_roomname,
 			    &CC->user, towhere);
-		c = getroom(&QRscratch, augmented_roomname);
+		c = CtdlGetRoom(&QRscratch, augmented_roomname);
 		if (c == 0)
 			safestrncpy(towhere, augmented_roomname, sizeof towhere);
 	}
@@ -1026,7 +1111,7 @@ void cmd_goto(char *gargs)
 		if (CC->internal_pgm) {
 			memcpy(&CC->room, &QRscratch,
 				sizeof(struct ctdlroom));
-			usergoto(NULL, 1, transiently, NULL, NULL);
+			CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
 			return;
 		}
 
@@ -1043,12 +1128,12 @@ void cmd_goto(char *gargs)
 			    ((ra & UA_GOTOALLOWED))) {
 				memcpy(&CC->room, &QRscratch,
 					sizeof(struct ctdlroom));
-				usergoto(NULL, 1, transiently, NULL, NULL);
+				CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
 				return;
 			} else if ((QRscratch.QRflags & QR_PASSWORDED) &&
 			    ((ra & UA_KNOWN) == 0) &&
 			    (strcasecmp(QRscratch.QRpasswd, password)) &&
-			    (CC->user.axlevel < 6)
+			    (CC->user.axlevel < AxAideU)
 			    ) {
 				cprintf("%d wrong or missing passwd\n",
 					ERROR + PASSWORD_REQUIRED);
@@ -1057,13 +1142,13 @@ void cmd_goto(char *gargs)
 				   ((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
 				   ((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
 				   ((ra & UA_KNOWN) == 0) &&
-			           (CC->user.axlevel < 6)
+			           (CC->user.axlevel < AxAideU)
                                   ) {
-				lprintf(CTDL_DEBUG, "Failed to acquire private room\n");
+				CtdlLogPrintf(CTDL_DEBUG, "Failed to acquire private room\n");
 			} else {
 				memcpy(&CC->room, &QRscratch,
 					sizeof(struct ctdlroom));
-				usergoto(NULL, 1, transiently, NULL, NULL);
+				CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
 				return;
 			}
 		}
@@ -1073,7 +1158,7 @@ void cmd_goto(char *gargs)
 }
 
 
-void cmd_whok(void)
+void cmd_whok(char *cmdbuf)
 {
 	struct ctdluser temp;
 	struct cdbdata *cdbus;
@@ -1099,91 +1184,104 @@ void cmd_whok(void)
 /*
  * RDIR command for room directory
  */
-void cmd_rdir(void)
+void cmd_rdir(char *cmdbuf)
 {
 	char buf[256];
-	char flnm[256];
 	char comment[256];
-	FILE *ls, *fd;
+	FILE *fd;
 	struct stat statbuf;
-	char tempfilename[PATH_MAX];
-
+	DIR *filedir = NULL;
+	struct dirent *filedir_entry;
+	int d_namelen;
+	char buf2[SIZ];
+	char mimebuf[64];
+	long len;
+	
 	if (CtdlAccessCheck(ac_logged_in)) return;
-	CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
 	
-	getroom(&CC->room, CC->room.QRname);
-	getuser(&CC->user, CC->curr_user);
+	CtdlGetRoom(&CC->room, CC->room.QRname);
+	CtdlGetUser(&CC->user, CC->curr_user);
 
 	if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
 		cprintf("%d not here.\n", ERROR + NOT_HERE);
 		return;
 	}
 	if (((CC->room.QRflags & QR_VISDIR) == 0)
-	    && (CC->user.axlevel < 6)
+	    && (CC->user.axlevel < AxAideU)
 	    && (CC->user.usernum != CC->room.QRroomaide)) {
 		cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED);
 		return;
 	}
-	cprintf("%d %s|%s/%s\n",
-			LISTING_FOLLOWS, 
-			config.c_fqdn,
-			ctdl_file_dir, 
-			CC->room.QRdirname);
-
-	snprintf(buf, sizeof buf, 
-			 "ls %s/%s >%s 2>/dev/null",
-			 ctdl_file_dir,
-			 CC->room.QRdirname, 
-			 tempfilename);
-	system(buf);
-
-	snprintf(buf, sizeof buf, 
-			 "%s/%s/filedir",
-			 ctdl_file_dir,
-			 CC->room.QRdirname);
+
+	snprintf(buf, sizeof buf, "%s/%s", ctdl_file_dir, CC->room.QRdirname);
+	filedir = opendir (buf);
+	
+	if (filedir == NULL) {
+		cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED);
+		return;
+	}
+	cprintf("%d %s|%s/%s\n", LISTING_FOLLOWS, config.c_fqdn, ctdl_file_dir, CC->room.QRdirname);
+	
+	snprintf(buf, sizeof buf, "%s/%s/filedir", ctdl_file_dir, CC->room.QRdirname);
 	fd = fopen(buf, "r");
 	if (fd == NULL)
 		fd = fopen("/dev/null", "r");
-
-	ls = fopen(tempfilename, "r");
-	while (fgets(flnm, sizeof flnm, ls) != NULL) {
-		flnm[strlen(flnm) - 1] = 0;
-		if (strcasecmp(flnm, "filedir")) {
-			snprintf(buf, sizeof buf, 
-					 "%s/%s/%s",
-					 ctdl_file_dir,
-					 CC->room.QRdirname,
-					 flnm);
-			stat(buf, &statbuf);
+	while ((filedir_entry = readdir(filedir)))
+	{
+		if (strcasecmp(filedir_entry->d_name, "filedir") && filedir_entry->d_name[0] != '.')
+		{
+#ifdef _DIRENT_HAVE_D_NAMELEN
+			d_namelen = filedir_entry->d_namelen;
+#else
+			d_namelen = strlen(filedir_entry->d_name);
+#endif
+			snprintf(buf, sizeof buf, "%s/%s/%s", ctdl_file_dir, CC->room.QRdirname, filedir_entry->d_name);
+			stat(buf, &statbuf);	/* stat the file */
+			if (!(statbuf.st_mode & S_IFREG))
+			{
+				snprintf(buf2, sizeof buf2,
+					"\"%s\" appears in the file directory for room \"%s\" but is not a regular file.  Directories, named pipes, sockets, etc. are not usable in Citadel room directories.\n",
+					buf, CC->room.QRname
+				);
+				CtdlAideMessage(buf2, "Unusable data found in room directory");
+				continue;	/* not a useable file type so don't show it */
+			}
 			safestrncpy(comment, "", sizeof comment);
-			fseek(fd, 0L, 0);
-			while ((fgets(buf, sizeof buf, fd) != NULL)
-			       && (IsEmptyStr(comment))) {
+			fseek(fd, 0L, 0);	/* rewind descriptions file */
+			/* Get the description from the descriptions file */
+			while ((fgets(buf, sizeof buf, fd) != NULL) && (IsEmptyStr(comment))) 
+			{
 				buf[strlen(buf) - 1] = 0;
-				if ((!strncasecmp(buf, flnm, strlen(flnm)))
-				    && (buf[strlen(flnm)] == ' '))
-					safestrncpy(comment,
-					    &buf[strlen(flnm) + 1],
-					    sizeof comment);
+				if ((!strncasecmp(buf, filedir_entry->d_name, d_namelen)) && (buf[d_namelen] == ' '))
+					safestrncpy(comment, &buf[d_namelen + 1], sizeof comment);
+			}
+			len = extract_token (mimebuf, comment, 0,' ', 64);
+			if ((len <0) || strchr(mimebuf, '/') == NULL)
+			{
+				snprintf (mimebuf, 64, "application/octetstream");
+				len = 0;
 			}
-			cprintf("%s|%ld|%s\n", flnm, (long)statbuf.st_size, comment);
+			cprintf("%s|%ld|%s|%s\n", 
+				filedir_entry->d_name, 
+				(long)statbuf.st_size, 
+				mimebuf, 
+				&comment[len]);
 		}
 	}
-	fclose(ls);
 	fclose(fd);
-	unlink(tempfilename);
-
+	closedir(filedir);
+	
 	cprintf("000\n");
 }
 
 /*
  * get room parameters (aide or room aide command)
  */
-void cmd_getr(void)
+void cmd_getr(char *cmdbuf)
 {
 	if (CtdlAccessCheck(ac_room_aide)) return;
 
-	getroom(&CC->room, CC->room.QRname);
+	CtdlGetRoom(&CC->room, CC->room.QRname);
 	cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n",
 		CIT_OK,
 		CtdlCheckExpress(),
@@ -1225,11 +1323,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
 	long owner = 0L;
 	char actual_old_name[ROOMNAMELEN];
 
-	lprintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n",
+	CtdlLogPrintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n",
 		old_name, new_name, new_floor);
 
 	if (new_floor >= 0) {
-		fl = cgetfloor(new_floor);
+		fl = CtdlGetCachedFloor(new_floor);
 		if ((fl->f_flags & F_INUSE) == 0) {
 			return(crr_invalid_floor);
 		}
@@ -1237,22 +1335,22 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
 
 	begin_critical_section(S_ROOMS);
 
-	if ( (getroom(&qrtmp, new_name) == 0) 
+	if ( (CtdlGetRoom(&qrtmp, new_name) == 0) 
 	   && (strcasecmp(new_name, old_name)) ) {
 		ret = crr_already_exists;
 	}
 
-	else if (getroom(&qrbuf, old_name) != 0) {
+	else if (CtdlGetRoom(&qrbuf, old_name) != 0) {
 		ret = crr_room_not_found;
 	}
 
-	else if ( (CC->user.axlevel < 6) && (!CC->internal_pgm)
+	else if ( (CC->user.axlevel < AxAideU) && (!CC->internal_pgm)
 		  && (CC->user.usernum != qrbuf.QRroomaide)
 		  && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) )  {
 		ret = crr_access_denied;
 	}
 
-	else if (is_noneditable(&qrbuf)) {
+	else if (CtdlIsNonEditable(&qrbuf)) {
 		ret = crr_noneditable;
 	}
 
@@ -1283,7 +1381,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
 			new_floor = old_floor;
 		}
 		qrbuf.QRfloor = new_floor;
-		putroom(&qrbuf);
+		CtdlPutRoom(&qrbuf);
 
 		begin_critical_section(S_CONFIG);
 	
@@ -1316,11 +1414,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
 		lgetfloor(&flbuf, old_floor);
 		--flbuf.f_ref_count;
 		lputfloor(&flbuf, old_floor);
-		lprintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count);
+		CtdlLogPrintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count);
 		lgetfloor(&flbuf, new_floor);
 		++flbuf.f_ref_count;
 		lputfloor(&flbuf, new_floor);
-		lprintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
+		CtdlLogPrintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
 	}
 
 	/* ...and everybody say "YATTA!" */	
@@ -1382,7 +1480,7 @@ void cmd_setr(char *args)
 		return;
 	}
 
-	getroom(&CC->room, new_name);
+	CtdlGetRoom(&CC->room, new_name);
 
 	/* Now we have to do a bunch of other stuff */
 
@@ -1394,7 +1492,7 @@ void cmd_setr(char *args)
 			new_order = 127;
 	}
 
-	lgetroom(&CC->room, CC->room.QRname);
+	CtdlGetRoomLock(&CC->room, CC->room.QRname);
 
 	/* Directory room */
 	extract_token(buf, args, 2, '|', sizeof buf);
@@ -1455,7 +1553,7 @@ void cmd_setr(char *args)
 	}
 
 	/* Write the room record back to disk */
-	lputroom(&CC->room);
+	CtdlPutRoomLock(&CC->room);
 
 	/* Create a room directory if necessary */
 	if (CC->room.QRflags & QR_DIRECTORY) {
@@ -1466,7 +1564,7 @@ void cmd_setr(char *args)
 	}
 	snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n",
 		CC->room.QRname, CC->curr_user);
-	aide_message(buf, "Room modification Message");
+	CtdlAideMessage(buf, "Room modification Message");
 	cprintf("%d Ok\n", CIT_OK);
 }
 
@@ -1475,13 +1573,13 @@ void cmd_setr(char *args)
 /* 
  * get the name of the room aide for this room
  */
-void cmd_geta(void)
+void cmd_geta(char *cmdbuf)
 {
 	struct ctdluser usbuf;
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 
-	if (getuserbynumber(&usbuf, CC->room.QRroomaide) == 0) {
+	if (CtdlGetUserByNumber(&usbuf, CC->room.QRroomaide) == 0) {
 		cprintf("%d %s\n", CIT_OK, usbuf.fullname);
 	} else {
 		cprintf("%d \n", CIT_OK);
@@ -1501,19 +1599,19 @@ void cmd_seta(char *new_ra)
 
 	if (CtdlAccessCheck(ac_room_aide)) return;
 
-	if (getuser(&usbuf, new_ra) != 0) {
+	if (CtdlGetUser(&usbuf, new_ra) != 0) {
 		newu = (-1L);
 	} else {
 		newu = usbuf.usernum;
 	}
 
-	lgetroom(&CC->room, CC->room.QRname);
+	CtdlGetRoomLock(&CC->room, CC->room.QRname);
 	post_notice = 0;
 	if (CC->room.QRroomaide != newu) {
 		post_notice = 1;
 	}
 	CC->room.QRroomaide = newu;
-	lputroom(&CC->room);
+	CtdlPutRoomLock(&CC->room);
 
 	/*
 	 * We have to post the change notice _after_ writing changes to 
@@ -1528,7 +1626,7 @@ void cmd_seta(char *new_ra)
 			snprintf(buf, sizeof buf,
 				"There is now no room aide for \"%s\".\n",
 				CC->room.QRname);
-		aide_message(buf, "Aide Room Modification");
+		CtdlAideMessage(buf, "Aide Room Modification");
 	}
 	cprintf("%d Ok\n", CIT_OK);
 }
@@ -1536,7 +1634,7 @@ void cmd_seta(char *new_ra)
 /* 
  * retrieve info file for this room
  */
-void cmd_rinf(void)
+void cmd_rinf(char *gargs)
 {
 	char filename[128];
 	char buf[SIZ];
@@ -1564,17 +1662,17 @@ void cmd_rinf(void)
  * deleted to the user(s), but it won't actually get purged from the
  * database until THE DREADED AUTO-PURGER makes its next run.
  */
-void schedule_room_for_deletion(struct ctdlroom *qrbuf)
+void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf)
 {
 	char old_name[ROOMNAMELEN];
 	static int seq = 0;
 
-	lprintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n",
+	CtdlLogPrintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n",
 		qrbuf->QRname);
 
 	safestrncpy(old_name, qrbuf->QRname, sizeof old_name);
 
-	getroom(qrbuf, qrbuf->QRname);
+	CtdlGetRoom(qrbuf, qrbuf->QRname);
 
 	/* Turn the room into a private mailbox owned by a user who doesn't
 	 * exist.  This will immediately make the room invisible to everyone,
@@ -1588,7 +1686,7 @@ void schedule_room_for_deletion(struct ctdlroom *qrbuf)
 	qrbuf->QRflags |= QR_MAILBOX;
 	time(&qrbuf->QRgen);	/* Use a timestamp as the new generation number  */
 
-	putroom(qrbuf);
+	CtdlPutRoom(qrbuf);
 
 	b_deleteroom(old_name);
 }
@@ -1601,13 +1699,13 @@ void schedule_room_for_deletion(struct ctdlroom *qrbuf)
  * AUTO-PURGER in serv_expire.c.  All user-facing code should call
  * the asynchronous schedule_room_for_deletion() instead.)
  */
-void delete_room(struct ctdlroom *qrbuf)
+void CtdlDeleteRoom(struct ctdlroom *qrbuf)
 {
 	struct floor flbuf;
 	char filename[100];
 	/* TODO: filename magic? does this realy work? */
 
-	lprintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
+	CtdlLogPrintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
 
 	/* Delete the info file */
 	assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir);
@@ -1627,9 +1725,9 @@ void delete_room(struct ctdlroom *qrbuf)
 	CtdlDeleteMessages(qrbuf->QRname, NULL, 0, "");
 
 	/* Flag the room record as not in use */
-	lgetroom(qrbuf, qrbuf->QRname);
+	CtdlGetRoomLock(qrbuf, qrbuf->QRname);
 	qrbuf->QRflags = 0;
-	lputroom(qrbuf);
+	CtdlPutRoomLock(qrbuf);
 
 	/* then decrement the reference count for the floor */
 	lgetfloor(&flbuf, (int) (qrbuf->QRfloor));
@@ -1651,7 +1749,7 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
 		return(0);
 	}
 
-	if (is_noneditable(qr)) {
+	if (CtdlIsNonEditable(qr)) {
 		return(0);
 	}
 
@@ -1703,15 +1801,15 @@ void cmd_kill(char *argbuf)
 		}
 
 		/* Do the dirty work */
-		schedule_room_for_deletion(&CC->room);
+		CtdlScheduleRoomForDeletion(&CC->room);
 
 		/* Return to the Lobby */
-		usergoto(config.c_baseroom, 0, 0, NULL, NULL);
+		CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL);
 
 		/* tell the world what we did */
 		snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
 			 deleted_room_name, CC->curr_user);
-		aide_message(msg, "Room Purger Message");
+		CtdlAideMessage(msg, "Room Purger Message");
 		cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
 	} else {
 		cprintf("%d ok to delete.\n", CIT_OK);
@@ -1722,10 +1820,10 @@ void cmd_kill(char *argbuf)
 /*
  * Internal code to create a new room (returns room flags)
  *
- * Room types:  0=public, 1=guessname, 2=passworded, 3=inv-only,
+ * Room types:  0=public, 1=hidden, 2=passworded, 3=invitation-only,
  *              4=mailbox, 5=mailbox, but caller supplies namespace
  */
-unsigned create_room(char *new_room_name,
+unsigned CtdlCreateRoom(char *new_room_name,
 		     int new_room_type,
 		     char *new_room_pass,
 		     int new_room_floor,
@@ -1736,13 +1834,13 @@ unsigned create_room(char *new_room_name,
 
 	struct ctdlroom qrbuf;
 	struct floor flbuf;
-	struct visit vbuf;
+	visit vbuf;
 
-	lprintf(CTDL_DEBUG, "create_room(name=%s, type=%d, view=%d)\n",
+	CtdlLogPrintf(CTDL_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)\n",
 		new_room_name, new_room_type, new_room_view);
 
-	if (getroom(&qrbuf, new_room_name) == 0) {
-		lprintf(CTDL_DEBUG, "%s already exists.\n", new_room_name);
+	if (CtdlGetRoom(&qrbuf, new_room_name) == 0) {
+		CtdlLogPrintf(CTDL_DEBUG, "%s already exists.\n", new_room_name);
 		return(0);
 	}
 
@@ -1764,7 +1862,7 @@ unsigned create_room(char *new_room_name,
 	 * name accordingly (prepend the user number)
 	 */
 	if (new_room_type == 4) {
-		MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
+		CtdlMailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
 	}
 	else {
 		safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
@@ -1793,7 +1891,7 @@ unsigned create_room(char *new_room_name,
 	qrbuf.QRdefaultview = new_room_view;
 
 	/* save what we just did... */
-	putroom(&qrbuf);
+	CtdlPutRoom(&qrbuf);
 
 	/* bump the reference count on whatever floor the room is on */
 	lgetfloor(&flbuf, (int) qrbuf.QRfloor);
@@ -1853,7 +1951,7 @@ void cmd_cre8(char *args)
 	}
 
 	if (num_parms(args) >= 5) {
-		fl = cgetfloor(extract_int(args, 4));
+		fl = CtdlGetCachedFloor(extract_int(args, 4));
 		if (fl == NULL) {
 			cprintf("%d Invalid floor number.\n",
 				ERROR + INVALID_FLOOR_OPERATION);
@@ -1870,7 +1968,7 @@ void cmd_cre8(char *args)
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 
-	if (CC->user.axlevel < config.c_createax || CC->internal_pgm) {
+	if (CC->user.axlevel < config.c_createax && !CC->internal_pgm) {
 		cprintf("%d You need higher access to create rooms.\n",
 			ERROR + HIGHER_ACCESS_REQUIRED);
 		return;
@@ -1887,7 +1985,7 @@ void cmd_cre8(char *args)
 	}
 
 	if (new_room_type == 5) {
-		if (CC->user.axlevel < 6) {
+		if (CC->user.axlevel < AxAideU) {
 			cprintf("%d Higher access required\n", 
 				ERROR + HIGHER_ACCESS_REQUIRED);
 			return;
@@ -1895,7 +1993,7 @@ void cmd_cre8(char *args)
 	}
 
 	/* Check to make sure the requested room name doesn't already exist */
-	newflags = create_room(new_room_name,
+	newflags = CtdlCreateRoom(new_room_name,
 				new_room_type, new_room_pass, new_room_floor,
 				0, avoid_access, new_room_view);
 	if (newflags == 0) {
@@ -1911,7 +2009,7 @@ void cmd_cre8(char *args)
 
 	/* If we reach this point, the room needs to be created. */
 
-	newflags = create_room(new_room_name,
+	newflags = CtdlCreateRoom(new_room_name,
 			   new_room_type, new_room_pass, new_room_floor, 1, 0,
 			   new_room_view);
 
@@ -1927,7 +2025,7 @@ void cmd_cre8(char *args)
 		((newflags & QR_PASSWORDED) ? " Password: " : ""),
 		((newflags & QR_PASSWORDED) ? new_room_pass : "")
 	);
-	aide_message(notification_message, "Room Creation Message");
+	CtdlAideMessage(notification_message, "Room Creation Message");
 	free(notification_message);
 
 	cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
@@ -1950,9 +2048,9 @@ void cmd_einf(char *ok)
 		return;
 	}
 	assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir);
-	lprintf(CTDL_DEBUG, "opening\n");
+	CtdlLogPrintf(CTDL_DEBUG, "opening\n");
 	fp = fopen(infofilename, "w");
-	lprintf(CTDL_DEBUG, "checking\n");
+	CtdlLogPrintf(CTDL_DEBUG, "checking\n");
 	if (fp == NULL) {
 		cprintf("%d Cannot open %s: %s\n",
 		  ERROR + INTERNAL_ERROR, infofilename, strerror(errno));
@@ -1968,16 +2066,16 @@ void cmd_einf(char *ok)
 	fclose(fp);
 
 	/* now update the room index so people will see our new info */
-	lgetroom(&CC->room, CC->room.QRname);		/* lock so no one steps on us */
+	CtdlGetRoomLock(&CC->room, CC->room.QRname);		/* lock so no one steps on us */
 	CC->room.QRinfo = CC->room.QRhighest + 1L;
-	lputroom(&CC->room);
+	CtdlPutRoomLock(&CC->room);
 }
 
 
 /* 
  * cmd_lflr()   -  List all known floors
  */
-void cmd_lflr(void)
+void cmd_lflr(char *gargs)
 {
 	int a;
 	struct floor flbuf;
@@ -1987,7 +2085,7 @@ void cmd_lflr(void)
 	cprintf("%d Known floors:\n", LISTING_FOLLOWS);
 
 	for (a = 0; a < MAXFLOORS; ++a) {
-		getfloor(&flbuf, a);
+		CtdlGetFloor(&flbuf, a);
 		if (flbuf.f_flags & F_INUSE) {
 			cprintf("%d|%s|%d\n",
 				a,
@@ -2023,7 +2121,7 @@ void cmd_cflr(char *argbuf)
 	}
 
 	for (a = 0; a < MAXFLOORS; ++a) {
-		getfloor(&flbuf, a);
+		CtdlGetFloor(&flbuf, a);
 
 		/* note any free slots while we're scanning... */
 		if (((flbuf.f_flags & F_INUSE) == 0)
@@ -2134,3 +2232,37 @@ void cmd_eflr(char *argbuf)
 
 	cprintf("%d Ok\n", CIT_OK);
 }
+
+
+/*****************************************************************************/
+/*                      MODULE INITIALIZATION STUFF                          */
+/*****************************************************************************/
+
+CTDL_MODULE_INIT(room_ops)
+{
+	if (!threading) {
+		CtdlRegisterProtoHook(cmd_lrms, "LRMS", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_lkra, "LKRA", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_lkrn, "LKRN", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_lkro, "LKRO", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_lzrm, "LZRM", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_lprm, "LPRM", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_goto, "GOTO", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_whok, "WHOK", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_rdir, "RDIR", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_getr, "GETR", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_setr, "SETR", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_geta, "GETA", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_seta, "SETA", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_rinf, "RINF", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_kill, "KILL", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_cre8, "CRE8", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_einf, "EINF", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_lflr, "LFLR", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_cflr, "CFLR", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_kflr, "KFLR", "Autoconverted. TODO: document me.");
+		CtdlRegisterProtoHook(cmd_eflr, "EFLR", "Autoconverted. TODO: document me.");
+	}
+        /* return our Subversion id for the Log */
+	return "$Id$";
+}