The new server API no longer uses upload_type. Removed it from CitContext.
[citadel.git] / citadel / modules / ctdlproto / serv_file.c
index 46e6959b7edd6c0a2438f48485cfe1a6ea5410f4..936b46b8ec0f4f5a6b47012c6a54d886e13d243e 100644 (file)
@@ -1,7 +1,7 @@
 /* 
  * Server functions which handle file transfers and room directories.
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2018 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
  * GNU General Public License for more details.
  */
 
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
+#include <netdb.h>
 #include <libcitadel.h>
 #include <dirent.h>
-
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "ctdl_module.h"
 #include "citserver.h"
 #include "support.h"
@@ -35,14 +39,12 @@ void cmd_delf(char *filename)
                return;
 
        if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
-               cprintf("%d No directory in this room.\n",
-                       ERROR + NOT_HERE);
+               cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
                return;
        }
 
        if (IsEmptyStr(filename)) {
-               cprintf("%d You must specify a file name.\n",
-                       ERROR + FILE_NOT_FOUND);
+               cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
                return;
        }
        for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
@@ -51,22 +53,20 @@ void cmd_delf(char *filename)
                }
        }
        snprintf(pathname, sizeof pathname,
-                        "%s/%s/%s",
-                        ctdl_file_dir,
-                        CC->room.QRdirname, filename);
+                "%s/%s/%s",
+                ctdl_file_dir,
+                CC->room.QRdirname, filename
+       );
        a = unlink(pathname);
        if (a == 0) {
                cprintf("%d File '%s' deleted.\n", CIT_OK, pathname);
        }
        else {
-               cprintf("%d File '%s' not found.\n",
-                       ERROR + FILE_NOT_FOUND, pathname);
+               cprintf("%d File '%s' not found.\n", ERROR + FILE_NOT_FOUND, pathname);
        }
 }
 
 
-
-
 /*
  * move a file from one room directory to another
  */
@@ -86,14 +86,12 @@ void cmd_movf(char *cmdbuf)
        if (CtdlAccessCheck(ac_room_aide)) return;
 
        if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
-               cprintf("%d No directory in this room.\n",
-                       ERROR + NOT_HERE);
+               cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
                return;
        }
 
        if (IsEmptyStr(filename)) {
-               cprintf("%d You must specify a file name.\n",
-                       ERROR + FILE_NOT_FOUND);
+               cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
                return;
        }
 
@@ -102,11 +100,9 @@ void cmd_movf(char *cmdbuf)
                        filename[a] = '_';
                }
        }
-       snprintf(pathname, sizeof pathname, "./files/%s/%s",
-                CC->room.QRdirname, filename);
+       snprintf(pathname, sizeof pathname, "./files/%s/%s", CC->room.QRdirname, filename);
        if (access(pathname, 0) != 0) {
-               cprintf("%d File '%s' not found.\n",
-                       ERROR + FILE_NOT_FOUND, pathname);
+               cprintf("%d File '%s' not found.\n", ERROR + FILE_NOT_FOUND, pathname);
                return;
        }
 
@@ -115,23 +111,18 @@ void cmd_movf(char *cmdbuf)
                return;
        }
        if ((qrbuf.QRflags & QR_DIRECTORY) == 0) {
-               cprintf("%d '%s' is not a directory room.\n",
-                       ERROR + NOT_HERE, qrbuf.QRname);
+               cprintf("%d '%s' is not a directory room.\n", ERROR + NOT_HERE, qrbuf.QRname);
                return;
        }
-       snprintf(newpath, sizeof newpath, "./files/%s/%s", qrbuf.QRdirname,
-                filename);
+       snprintf(newpath, sizeof newpath, "./files/%s/%s", qrbuf.QRdirname, filename);
        if (link(pathname, newpath) != 0) {
-               cprintf("%d Couldn't move file: %s\n", ERROR + INTERNAL_ERROR,
-                       strerror(errno));
+               cprintf("%d Couldn't move file: %s\n", ERROR + INTERNAL_ERROR, strerror(errno));
                return;
        }
        unlink(pathname);
 
        /* this is a crude method of copying the file description */
-       snprintf(buf, sizeof buf,
-                "cat ./files/%s/filedir |grep \"%s\" >>./files/%s/filedir",
-                CC->room.QRdirname, filename, qrbuf.QRdirname);
+       snprintf(buf, sizeof buf, "cat ./files/%s/filedir |grep \"%s\" >>./files/%s/filedir", CC->room.QRdirname, filename, qrbuf.QRdirname);
        system(buf);
        cprintf("%d File '%s' has been moved.\n", CIT_OK, filename);
 }
@@ -155,8 +146,7 @@ void OpenCmdResult(char *filename, const char *mime_type)
        filesize = (long) statbuf.st_size;
        modtime = (time_t) statbuf.st_mtime;
 
-       cprintf("%d %ld|%ld|%s|%s\n",
-               CIT_OK, filesize, (long)modtime, filename, mime_type);
+       cprintf("%d %ld|%ld|%s|%s\n", CIT_OK, filesize, (long)modtime, filename, mime_type);
 }
 
 
@@ -174,26 +164,22 @@ void cmd_open(char *cmdbuf)
        if (CtdlAccessCheck(ac_logged_in)) return;
 
        if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
-               cprintf("%d No directory in this room.\n",
-                       ERROR + NOT_HERE);
+               cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
                return;
        }
 
        if (IsEmptyStr(filename)) {
-               cprintf("%d You must specify a file name.\n",
-                       ERROR + FILE_NOT_FOUND);
+               cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
                return;
        }
        if (strstr(filename, "../") != NULL)
        {
-               cprintf("%d syntax error.\n",
-                       ERROR + ILLEGAL_VALUE);
+               cprintf("%d syntax error.\n", ERROR + ILLEGAL_VALUE);
                return;
        }
 
        if (CC->download_fp != NULL) {
-               cprintf("%d You already have a download file open.\n",
-                       ERROR + RESOURCE_BUSY);
+               cprintf("%d You already have a download file open.\n", ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -203,21 +189,18 @@ void cmd_open(char *cmdbuf)
                }
        }
 
-       snprintf(pathname, sizeof pathname,
-                        "%s/%s/%s",
-                        ctdl_file_dir,
-                        CC->room.QRdirname, filename);
+       snprintf(pathname, sizeof pathname, "%s/%s/%s", ctdl_file_dir, CC->room.QRdirname, filename);
        CC->download_fp = fopen(pathname, "r");
 
        if (CC->download_fp == NULL) {
-               cprintf("%d cannot open %s: %s\n",
-                       ERROR + INTERNAL_ERROR, pathname, strerror(errno));
+               cprintf("%d cannot open %s: %s\n", ERROR + INTERNAL_ERROR, pathname, strerror(errno));
                return;
        }
 
        OpenCmdResult(filename, "application/octet-stream");
 }
 
+
 /*
  * open an image file
  */
@@ -226,65 +209,32 @@ void cmd_oimg(char *cmdbuf)
        char filename[PATH_MAX];
        char pathname[PATH_MAX];
        char MimeTestBuf[32];
-       int which_floor;
-       int a;
        int rv;
 
        extract_token(filename, cmdbuf, 0, '|', sizeof filename);
 
        if (IsEmptyStr(filename)) {
-               cprintf("%d You must specify a file name.\n",
-                       ERROR + FILE_NOT_FOUND);
+               cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
                return;
        }
 
        if (CC->download_fp != NULL) {
-               cprintf("%d You already have a download file open.\n",
-                       ERROR + RESOURCE_BUSY);
+               cprintf("%d You already have a download file open.\n", ERROR + RESOURCE_BUSY);
                return;
        }
 
-       if (!strcasecmp(filename, "_floorpic_")) {
-               which_floor = extract_int(cmdbuf, 1);
-               snprintf(pathname, sizeof pathname, "%s/floor.%d", ctdl_image_dir, which_floor);
-       }
-       else if (!strcasecmp(filename, "_roompic_")) {
-               assoc_file_name(pathname, sizeof pathname, &CC->room, ctdl_image_dir);
-       }
-       else {
-               for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
-                       filename[a] = tolower(filename[a]);
-                       if ( (filename[a] == '/') || (filename[a] == '\\') ) {
-                               filename[a] = '_';
-                       }
-               }
-               if (strstr(filename, "../") != NULL)
-               {
-                       cprintf("%d syntax error.\n",
-                               ERROR + ILLEGAL_VALUE);
-                       return;
-               }
-
-               snprintf(pathname, sizeof pathname,
-                                "%s/%s",
-                                ctdl_image_dir,
-                                filename);
-       }
-
        CC->download_fp = fopen(pathname, "rb");
        if (CC->download_fp == NULL) {
                strcat(pathname, ".gif");
                CC->download_fp = fopen(pathname, "rb");
        }
        if (CC->download_fp == NULL) {
-               cprintf("%d Cannot open %s: %s\n",
-                       ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
+               cprintf("%d Cannot open %s: %s\n", ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
                return;
        }
        rv = fread(&MimeTestBuf[0], 1, 32, CC->download_fp);
        if (rv == -1) {
-               cprintf("%d Cannot access %s: %s\n",
-                       ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
+               cprintf("%d Cannot access %s: %s\n", ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
                return;
        }
 
@@ -307,20 +257,17 @@ void cmd_uopn(char *cmdbuf)
        if (CtdlAccessCheck(ac_logged_in)) return;
 
        if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
-               cprintf("%d No directory in this room.\n",
-                       ERROR + NOT_HERE);
+               cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
                return;
        }
 
        if (IsEmptyStr(CC->upl_file)) {
-               cprintf("%d You must specify a file name.\n",
-                       ERROR + FILE_NOT_FOUND);
+               cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
                return;
        }
 
        if (CC->upload_fp != NULL) {
-               cprintf("%d You already have a upload file open.\n",
-                       ERROR + RESOURCE_BUSY);
+               cprintf("%d You already have a upload file open.\n", ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -329,35 +276,26 @@ void cmd_uopn(char *cmdbuf)
                        CC->upl_file[a] = '_';
                }
        }
-       snprintf(CC->upl_path, sizeof CC->upl_path, 
-                        "%s/%s/%s",
-                        ctdl_file_dir,
-                        CC->room.QRdirname, CC->upl_file);
-       snprintf(CC->upl_filedir, sizeof CC->upl_filedir,
-                        "%s/%s/filedir", 
-                        ctdl_file_dir,
-                        CC->room.QRdirname);
+       snprintf(CC->upl_path, sizeof CC->upl_path, "%s/%s/%s", ctdl_file_dir, CC->room.QRdirname, CC->upl_file);
+       snprintf(CC->upl_filedir, sizeof CC->upl_filedir, "%s/%s/filedir", ctdl_file_dir, CC->room.QRdirname);
 
        CC->upload_fp = fopen(CC->upl_path, "r");
        if (CC->upload_fp != NULL) {
                fclose(CC->upload_fp);
                CC->upload_fp = NULL;
-               cprintf("%d '%s' already exists\n",
-                       ERROR + ALREADY_EXISTS, CC->upl_path);
+               cprintf("%d '%s' already exists\n", ERROR + ALREADY_EXISTS, CC->upl_path);
                return;
        }
 
        CC->upload_fp = fopen(CC->upl_path, "wb");
        if (CC->upload_fp == NULL) {
-               cprintf("%d Cannot open %s: %s\n",
-                       ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
+               cprintf("%d Cannot open %s: %s\n", ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
                return;
        }
        cprintf("%d Ok\n", CIT_OK);
 }
 
 
-
 /*
  * open an image file for uploading
  */
@@ -365,7 +303,6 @@ void cmd_uimg(char *cmdbuf)
 {
        int is_this_for_real;
        char basenm[256];
-       int which_floor;
        int a;
 
        if (num_parms(cmdbuf) < 2) {
@@ -377,8 +314,7 @@ void cmd_uimg(char *cmdbuf)
        extract_token(CC->upl_mimetype, cmdbuf, 1, '|', sizeof CC->upl_mimetype);
        extract_token(basenm, cmdbuf, 2, '|', sizeof basenm);
        if (CC->upload_fp != NULL) {
-               cprintf("%d You already have an upload file open.\n",
-                       ERROR + RESOURCE_BUSY);
+               cprintf("%d You already have an upload file open.\n", ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -392,35 +328,11 @@ void cmd_uimg(char *cmdbuf)
        }
 
        if (CC->user.axlevel >= AxAideU) {
-               snprintf(CC->upl_path, sizeof CC->upl_path, 
-                                "%s/%s",
-                                ctdl_image_dir,
-                                basenm);
-       }
-
-       if (!strcasecmp(basenm, "_userpic_")) {
-               snprintf(CC->upl_path, sizeof CC->upl_path,
-                                "%s/%ld.gif",
-                                ctdl_usrpic_dir,
-                                CC->user.usernum);
-       }
-
-       if ((!strcasecmp(basenm, "_floorpic_"))
-           && (CC->user.axlevel >= AxAideU)) {
-               which_floor = extract_int(cmdbuf, 2);
-               snprintf(CC->upl_path, sizeof CC->upl_path,
-                                "%s/floor.%d.gif",
-                                ctdl_image_dir,
-                                which_floor);
-       }
-
-       if ((!strcasecmp(basenm, "_roompic_")) && (is_room_aide())) {
-               assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, ctdl_image_dir);
+               snprintf(CC->upl_path, sizeof CC->upl_path, "%s/%s", ctdl_image_dir, basenm);
        }
 
        if (IsEmptyStr(CC->upl_path)) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
+               cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED);
                return;
        }
 
@@ -431,12 +343,10 @@ void cmd_uimg(char *cmdbuf)
 
        CC->upload_fp = fopen(CC->upl_path, "wb");
        if (CC->upload_fp == NULL) {
-               cprintf("%d Cannot open %s: %s\n",
-                       ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
+               cprintf("%d Cannot open %s: %s\n", ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
                return;
        }
        cprintf("%d Ok\n", CIT_OK);
-       CC->upload_type = UPL_IMAGE;
 }
 
 
@@ -448,23 +358,12 @@ void cmd_clos(char *cmdbuf)
        char buf[256];
 
        if (CC->download_fp == NULL) {
-               cprintf("%d You don't have a download file open.\n",
-                       ERROR + RESOURCE_NOT_OPEN);
+               cprintf("%d You don't have a download file open.\n", ERROR + RESOURCE_NOT_OPEN);
                return;
        }
 
        fclose(CC->download_fp);
        CC->download_fp = NULL;
-
-       if (CC->dl_is_net == 1) {
-               CC->dl_is_net = 0;
-               snprintf(buf, sizeof buf, 
-                                "%s/%s",
-                                ctdl_netout_dir,
-                                CC->net_node);
-               unlink(buf);
-       }
-
        cprintf("%d Ok\n", CIT_OK);
 }
 
@@ -482,7 +381,6 @@ void abort_upl(CitContext *who)
 }
 
 
-
 /*
  * close the upload file
  */
@@ -501,38 +399,6 @@ void cmd_ucls(char *cmd)
        fclose(CC->upload_fp);
        CCC->upload_fp = NULL;
 
-       if ((!strcasecmp(cmd, "1")) && (CCC->upload_type != UPL_FILE)) {
-               cprintf("%d Upload completed.\n", CIT_OK);
-
-               if (CCC->upload_type == UPL_NET) {
-                       char final_filename[PATH_MAX];
-                       snprintf(final_filename, sizeof final_filename,
-                               "%s/%s.%04lx.%04x",
-                               ctdl_netin_dir,
-                               CCC->net_node,
-                               (long)getpid(),
-                               ++seq
-                       );
-
-                       if (link(CCC->upl_path, final_filename) == 0) {
-                               CTDL_syslog(LOG_INFO, "UCLS: updoaded %s",
-                                      final_filename);
-                               unlink(CCC->upl_path);
-                       }
-                       else {
-                               CTDL_syslog(LOG_INFO, "Cannot link %s to %s: %s",
-                                           CCC->upl_path, final_filename, strerror(errno)
-                               );
-                       }
-                       
-
-                       /* FIXME ... here we need to trigger a network run */
-               }
-
-               CCC->upload_type = UPL_FILE;
-               return;
-       }
-
        if (!strcasecmp(cmd, "1")) {
                cprintf("%d File '%s' saved.\n", CIT_OK, CCC->upl_path);
                fp = fopen(CCC->upl_filedir, "a");
@@ -540,9 +406,7 @@ void cmd_ucls(char *cmd)
                        fp = fopen(CCC->upl_filedir, "w");
                }
                if (fp != NULL) {
-                       fprintf(fp, "%s %s %s\n", CCC->upl_file,
-                               CCC->upl_mimetype,
-                               CCC->upl_comment);
+                       fprintf(fp, "%s %s %s\n", CCC->upl_file, CCC->upl_mimetype, CCC->upl_comment);
                        fclose(fp);
                }
 
@@ -582,8 +446,7 @@ void cmd_read(char *cmdbuf)
        }
 
        if (CC->download_fp == NULL) {
-               cprintf("%d You don't have a download file open.\n",
-                       ERROR + RESOURCE_NOT_OPEN);
+               cprintf("%d You don't have a download file open.\n", ERROR + RESOURCE_NOT_OPEN);
                return;
        }
 
@@ -594,12 +457,12 @@ void cmd_read(char *cmdbuf)
 
        rc = fseek(CC->download_fp, start_pos, 0);
        if (rc < 0) {
-               struct CitContext *CCC = CC;
-               cprintf("%d your file is smaller then %ld.\n", ERROR + ILLEGAL_VALUE, start_pos);
-               CTDL_syslog(LOG_ERR, "your file %s is smaller then %ld. [%s]\n"
-                           CC->upl_path, 
-                           start_pos,
-                           strerror(errno));
+               cprintf("%d your file is smaller than %ld.\n", ERROR + ILLEGAL_VALUE, start_pos);
+               syslog(LOG_ERR, "serv_file: your file %s is smaller than %ld [%s]", 
+                       CC->upl_path
+                       start_pos,
+                       strerror(errno)
+               );
 
                return;
        }
@@ -647,112 +510,12 @@ void cmd_writ(char *cmdbuf)
        client_read(buf, bytes);
        rv = fwrite(buf, bytes, 1, CCC->upload_fp);
        if (rv == -1) {
-               CTDL_syslog(LOG_EMERG, "Couldn't write: %s\n",
-                           strerror(errno));
+               syslog(LOG_ERR, "serv_file: %s", strerror(errno));
        }
        free(buf);
 }
 
 
-
-
-/*
- * cmd_ndop() - open a network spool file for downloading
- */
-void cmd_ndop(char *cmdbuf)
-{
-       struct CitContext *CCC = CC;
-       char pathname[256];
-       struct stat statbuf;
-
-       if (IsEmptyStr(CCC->net_node)) {
-               cprintf("%d Not authenticated as a network node.\n",
-                       ERROR + NOT_LOGGED_IN);
-               return;
-       }
-
-       if (CCC->download_fp != NULL) {
-               cprintf("%d You already have a download file open.\n",
-                       ERROR + RESOURCE_BUSY);
-               return;
-       }
-
-       snprintf(pathname, sizeof pathname, 
-                        "%s/%s",
-                        ctdl_netout_dir,
-                        CCC->net_node);
-
-       /* first open the file in append mode in order to create a
-        * zero-length file if it doesn't already exist 
-        */
-       CCC->download_fp = fopen(pathname, "a");
-       if (CCC->download_fp != NULL)
-               fclose(CCC->download_fp);
-
-       /* now open it */
-       CCC->download_fp = fopen(pathname, "r");
-       if (CCC->download_fp == NULL) {
-               cprintf("%d cannot open %s: %s\n",
-                       ERROR + INTERNAL_ERROR, pathname, strerror(errno));
-               return;
-       }
-
-
-       /* set this flag so other routines know that the download file
-        * currently open is a network spool file 
-        */
-       CCC->dl_is_net = 1;
-
-       stat(pathname, &statbuf);
-       CCC->download_fp_total = statbuf.st_size;
-       cprintf("%d %ld\n", CIT_OK, (long)statbuf.st_size);
-}
-
-/*
- * cmd_nuop() - open a network spool file for uploading
- */
-void cmd_nuop(char *cmdbuf)
-{
-       static int seq = 1;
-
-       if (IsEmptyStr(CC->net_node)) {
-               cprintf("%d Not authenticated as a network node.\n",
-                       ERROR + NOT_LOGGED_IN);
-               return;
-       }
-
-       if (CC->upload_fp != NULL) {
-               cprintf("%d You already have an upload file open.\n",
-                       ERROR + RESOURCE_BUSY);
-               return;
-       }
-
-       snprintf(CC->upl_path, sizeof CC->upl_path,
-                        "%s/%s.%04lx.%04x",
-                        ctdl_nettmp_dir,
-                        CC->net_node, 
-                        (long)getpid(), 
-                        ++seq);
-
-       CC->upload_fp = fopen(CC->upl_path, "r");
-       if (CC->upload_fp != NULL) {
-               fclose(CC->upload_fp);
-               CC->upload_fp = NULL;
-               cprintf("%d '%s' already exists\n",
-                       ERROR + ALREADY_EXISTS, CC->upl_path);
-               return;
-       }
-
-       CC->upload_fp = fopen(CC->upl_path, "w");
-       if (CC->upload_fp == NULL) {
-               cprintf("%d Cannot open %s: %s\n",
-                       ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
-               return;
-       }
-
-       CC->upload_type = UPL_NET;
-       cprintf("%d Ok\n", CIT_OK);
-}
 void files_logout_hook(void)
 {
         CitContext *CCC = MyContext();
@@ -774,6 +537,7 @@ void files_logout_hook(void)
 
 }
 
+
 /* 
  * help_subst()  -  support routine for help file viewer
  */
@@ -789,6 +553,7 @@ void help_subst(char *strbuf, char *source, char *dest)
        }
 }
 
+
 void do_help_subst(char *buffer)
 {
        char buf2[16];
@@ -816,22 +581,17 @@ void cmd_mesg(char *mname)
        char targ[256];
        char buf[256];
        char buf2[256];
-       char *dirs[2];
        DIR *dp;
        struct dirent *d;
 
        extract_token(buf, mname, 0, '|', sizeof buf);
 
-       dirs[0] = strdup(ctdl_message_dir);
-       dirs[1] = strdup(ctdl_hlp_dir);
-
-       snprintf(buf2, sizeof buf2, "%s.%d.%d",
-               buf, CC->cs_clientdev, CC->cs_clienttyp);
+       snprintf(buf2, sizeof buf2, "%s.%d.%d", buf, CC->cs_clientdev, CC->cs_clienttyp);
 
        /* If the client requested "?" then produce a listing */
        if (!strcmp(buf, "?")) {
                cprintf("%d %s\n", LISTING_FOLLOWS, buf);
-               dp = opendir(dirs[1]);
+               dp = opendir(ctdl_message_dir);
                if (dp != NULL) {
                        while (d = readdir(dp), d != NULL) {
                                if (d->d_name[0] != '.') {
@@ -841,46 +601,18 @@ void cmd_mesg(char *mname)
                        closedir(dp);
                }
                cprintf("000\n");
-               free(dirs[0]);
-               free(dirs[1]);
                return;
        }
 
        /* Otherwise, look for the requested file by name. */
-       else {
-               mesg_locate(targ, sizeof targ, buf2, 2, (const ccharp*)dirs);
-               if (IsEmptyStr(targ)) {
-                       snprintf(buf2, sizeof buf2, "%s.%d",
-                                                       buf, CC->cs_clientdev);
-                       mesg_locate(targ, sizeof targ, buf2, 2,
-                                   (const ccharp*)dirs);
-                       if (IsEmptyStr(targ)) {
-                               mesg_locate(targ, sizeof targ, buf, 2,
-                                           (const ccharp*)dirs);
-                       }       
-               }
-       }
-
-       free(dirs[0]);
-       free(dirs[1]);
-
-       if (IsEmptyStr(targ)) {
-               cprintf("%d '%s' not found.  (Searching in %s and %s)\n",
-                       ERROR + FILE_NOT_FOUND,
-                       mname,
-                       ctdl_message_dir,
-                       ctdl_hlp_dir
-               );
-               return;
-       }
-
+       snprintf(targ, sizeof targ, "%s/%s", ctdl_message_dir, buf);
        mfp = fopen(targ, "r");
        if (mfp==NULL) {
                cprintf("%d Cannot open '%s': %s\n",
-                       ERROR + INTERNAL_ERROR, targ, strerror(errno));
+                       ERROR + FILE_NOT_FOUND, targ, strerror(errno));
                return;
        }
-       cprintf("%d %s\n", LISTING_FOLLOWS,buf);
+       cprintf("%d %s\n", LISTING_FOLLOWS, buf);
 
        while (fgets(buf, (sizeof buf - 1), mfp) != NULL) {
                buf[strlen(buf)-1] = 0;
@@ -901,7 +633,6 @@ void cmd_emsg(char *mname)
        FILE *mfp;
        char targ[256];
        char buf[256];
-       char *dirs[2];
        int a;
 
        unbuffer_output();
@@ -913,20 +644,11 @@ void cmd_emsg(char *mname)
                if (buf[a] == '/') buf[a] = '.';
        }
 
-       dirs[0] = strdup(ctdl_message_dir);
-       dirs[1] = strdup(ctdl_hlp_dir);
-
-       mesg_locate(targ, sizeof targ, buf, 2, (const ccharp*)dirs);
-       free(dirs[0]);
-       free(dirs[1]);
-
        if (IsEmptyStr(targ)) {
-               snprintf(targ, sizeof targ, 
-                                "%s/%s",
-                                ctdl_hlp_dir, buf);
+               snprintf(targ, sizeof targ, "%s/%s", ctdl_message_dir, buf);
        }
 
-       mfp = fopen(targ,"w");
+       mfp = fopen(targ, "w");
        if (mfp==NULL) {
                cprintf("%d Cannot open '%s': %s\n",
                        ERROR + INTERNAL_ERROR, targ, strerror(errno));
@@ -949,7 +671,6 @@ CTDL_MODULE_INIT(file_ops)
 {
        if (!threading) {
                 CtdlRegisterSessionHook(files_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 8);
-
                CtdlRegisterProtoHook(cmd_delf, "DELF", "Delete a file");
                CtdlRegisterProtoHook(cmd_movf, "MOVF", "Move a file");
                CtdlRegisterProtoHook(cmd_open, "OPEN", "Open a download file transfer");
@@ -958,11 +679,8 @@ CTDL_MODULE_INIT(file_ops)
                CtdlRegisterProtoHook(cmd_ucls, "UCLS", "Close an upload file transfer");
                CtdlRegisterProtoHook(cmd_read, "READ", "File transfer read operation");
                CtdlRegisterProtoHook(cmd_writ, "WRIT", "File transfer write operation");
-               CtdlRegisterProtoHook(cmd_ndop, "NDOP", "Open a network spool file for download");
-               CtdlRegisterProtoHook(cmd_nuop, "NUOP", "Open a network spool file for upload");
                CtdlRegisterProtoHook(cmd_oimg, "OIMG", "Open an image file for download");
                CtdlRegisterProtoHook(cmd_uimg, "UIMG", "Upload an image file");
-
                CtdlRegisterProtoHook(cmd_mesg, "MESG", "fetch system banners");
                CtdlRegisterProtoHook(cmd_emsg, "EMSG", "submit system banners");
        }