* UIMG and UOPN require the client to specify a Mimetype now.

[citadel.git] / citadel / rooms.c

diff --git a/citadel/rooms.c b/citadel/rooms.c
index 22672009fbfff31be8fd43006f33978a53d1165c..30edd1fe845ee01a238a7851ab772bee7fa8e916 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -19,12 +19,12 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "citadel_ipc.h"
 #include "citadel_decls.h"
 #include "rooms.h"
 #include "commands.h"
-#include "tools.h"
 #include "messages.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
@@ -79,7 +79,7 @@ void load_floorlist(CtdlIPC *ipc)
                strcpy(floorlist[0], "Main Floor");
                return;
        }
-       while (*listing && strlen(listing)) {
+       while (*listing && !IsEmptyStr(listing)) {
                extract_token(buf, listing, 0, '\n', sizeof buf);
                remove_token(listing, 0, '\n');
                extract_token(floorlist[extract_int(buf, 0)], buf, 1, '|', SIZ);
@@ -518,7 +518,7 @@ void editthisroom(CtdlIPC *ipc)
        } else {
                strcpy(raide, "");
        }
-       if (strlen(raide) == 0) {
+       if (IsEmptyStr(raide)) {
                strcpy(raide, "none");
        }
 
@@ -701,7 +701,7 @@ void dotungoto(CtdlIPC *ipc, char *towhere)
                scr_printf("Must specify a room to ungoto.\n");
                return;
       }
-       if (strlen(towhere) == 0)
+       if (IsEmptyStr(towhere))
       {
                scr_printf("Must specify a room to ungoto.\n");
                return;
@@ -801,7 +801,7 @@ void destination_directory(char *dest, const char *supplied_filename)
 {
        static char save_dir[SIZ] = { 0 };
 
-       if (strlen(save_dir) == 0) {
+       if (IsEmptyStr(save_dir)) {
                if (getenv("HOME") == NULL) {
                        strcpy(save_dir, ".");
                }
@@ -922,6 +922,7 @@ void roomdir(CtdlIPC *ipc)
        char flnm[256];
        char flsz[32];
        char comment[256];
+       char mimetype[256];
        char buf[256];
        char *listing = NULL;   /* Returned directory listing */
        int r;
@@ -936,18 +937,19 @@ void roomdir(CtdlIPC *ipc)
        extract_token(flnm, buf, 1, '|', sizeof flnm);
        pprintf("\nDirectory of %s on %s\n", flnm, comment);
        pprintf("-----------------------\n");
-       while (listing && *listing && strlen(listing)) {
+       while (listing && *listing && !IsEmptyStr(listing)) {
                extract_token(buf, listing, 0, '\n', sizeof buf);
                remove_token(listing, 0, '\n');
 
                extract_token(flnm, buf, 0, '|', sizeof flnm);
                extract_token(flsz, buf, 1, '|', sizeof flsz);
-               extract_token(comment, buf, 2, '|', sizeof comment);
+               extract_token(mimetype, buf, 2, '|', sizeof mimetype);
+               extract_token(comment, buf, 3, '|', sizeof comment);
                if (strlen(flnm) <= 14)
-                       pprintf("%-14s %8s %s\n", flnm, flsz, comment);
+                       pprintf("%-14s %8s %s [%s]\n", flnm, flsz, comment, mimetype);
                else
-                       pprintf("%s\n%14s %8s %s\n", flnm, "", flsz,
-                               comment);
+                       pprintf("%s\n%14s %8s %s [%s]\n", flnm, "", flsz,
+                               comment, mimetype);
        }
        if (listing) free(listing);
 }
@@ -1054,10 +1056,10 @@ void entroom(CtdlIPC *ipc)
        }
 
        newprompt("Name for new room? ", new_room_name, ROOMNAMELEN - 1);
-       if (strlen(new_room_name) == 0) {
+       if (IsEmptyStr(new_room_name)) {
                return;
        }
-       for (a = 0; a < strlen(new_room_name); ++a) {
+       for (a = 0; !IsEmptyStr(&new_room_name[a]); ++a) {
                if (new_room_name[a] == '|') {
                        new_room_name[a] = '_';
                }
@@ -1084,7 +1086,7 @@ void entroom(CtdlIPC *ipc)
        new_room_type = b - 1;
        if (new_room_type == 2) {
                newprompt("Enter a room password: ", new_room_pass, 9);
-               for (a = 0; a < strlen(new_room_pass); ++a)
+               for (a = 0; !IsEmptyStr(&new_room_pass[a]); ++a)
                        if (new_room_pass[a] == '|')
                                new_room_pass[a] = '_';
        } else {
@@ -1134,7 +1136,7 @@ void readinfo(CtdlIPC *ipc)
        else
                strcpy(raide, "");
 
-       if (strlen(raide) > 0)
+       if (!IsEmptyStr(raide))
                scr_printf("Room aide is %s.\n\n", raide);
 
        r = CtdlIPCRoomInfo(ipc, &text, buf);
@@ -1164,7 +1166,7 @@ void whoknows(CtdlIPC *ipc)
                pprintf("%s\n", buf);
                return;
        }
-       while (strlen(listing) > 0) {
+       while (!IsEmptyStr(listing)) {
                extract_token(buf, listing, 0, '\n', sizeof buf);
                remove_token(listing, 0, '\n');
                if (sigcaught == 0)
@@ -1181,7 +1183,7 @@ void do_edit(CtdlIPC *ipc,
        char cmd[SIZ];
        int b, cksum, editor_exit;
 
-       if (strlen(editor_paths[0]) == 0) {
+       if (IsEmptyStr(editor_paths[0])) {
                scr_printf("Do you wish to re-enter %s? ", desc);
                if (yesno() == 0)
                        return;
@@ -1197,7 +1199,7 @@ void do_edit(CtdlIPC *ipc,
                return;
        }
 
-       if (strlen(editor_paths[0]) > 0) {
+       if (!IsEmptyStr(editor_paths[0])) {
                CtdlIPC_chat_send(ipc, read_cmd);
                CtdlIPC_chat_recv(ipc, cmd);
                if (cmd[0] == '1') {
@@ -1211,7 +1213,7 @@ void do_edit(CtdlIPC *ipc,
 
        cksum = file_checksum(temp);
 
-       if (strlen(editor_paths[0]) > 0) {
+       if (!IsEmptyStr(editor_paths[0])) {
                char tmp[SIZ];
 
                snprintf(tmp, sizeof tmp, "WINDOW_TITLE=%s", desc);
@@ -1380,7 +1382,7 @@ void kill_floor(CtdlIPC *ipc)
                floornum_to_delete = (-1);
                scr_printf("(Press return to abort)\n");
                newprompt("Delete which floor? ", buf, 255);
-               if (strlen(buf) == 0)
+               if (IsEmptyStr(buf))
                        return;
                for (a = 0; a < 128; ++a)
                        if (!strcasecmp(&floorlist[a][0], buf))