Removed all references to ctdl_hlp_dir. cmd_mesg() and cmd_emsg() now only look...

diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index db669ba9b85b16f78f1b597cce46d122dec014e8..a7fddb9d558d8a5047a8a1d381420a901d29f86d 100644 (file)
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -13,7 +13,6 @@ extern char ctdl_bb_dir[PATH_MAX];
 extern char ctdl_data_dir[PATH_MAX];
 extern char ctdl_dspam_dir[PATH_MAX];
 extern char ctdl_file_dir[PATH_MAX];
-extern char ctdl_hlp_dir[PATH_MAX];
 extern char ctdl_shared_dir[PATH_MAX];
 extern char ctdl_image_dir[PATH_MAX];
 extern char ctdl_info_dir[PATH_MAX];

diff --git a/citadel/modules/ctdlproto/serv_file.c b/citadel/modules/ctdlproto/serv_file.c
index 738c80b3ff73b76b1add69a1890f2e3f17909c17..9ffb51b0500c945031b8d71629381b51861be7cd 100644 (file)
--- a/citadel/modules/ctdlproto/serv_file.c
+++ b/citadel/modules/ctdlproto/serv_file.c
@@ -763,22 +763,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] != '.') {
@@ -788,43 +783,15 @@ 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);
@@ -848,7 +815,6 @@ void cmd_emsg(char *mname)
        FILE *mfp;
        char targ[256];
        char buf[256];
-       char *dirs[2];
        int a;
 
        unbuffer_output();
@@ -860,20 +826,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));

diff --git a/citadel/support.c b/citadel/support.c
index 56941c36fb23abac8f365b3d20c4dc44ffd21588..af155d31df92298178ab5e9c03a742be304fa133 100644 (file)
--- a/citadel/support.c
+++ b/citadel/support.c
@@ -81,28 +81,3 @@ int getstring(FILE *fp, char *string)
                } while(string[0]=='#');
        return(strlen(string));
 }
-
-
-
-
-/*
- * mesg_locate()  -  locate a message or help file, case insensitive
- */
-void mesg_locate(char *targ, size_t n, const char *searchfor,
-                int numdirs, const char * const *dirs)
-{
-       int a;
-       char buf[SIZ];
-       struct stat test;
-
-       for (a=0; a<numdirs; ++a) {
-               snprintf(buf, sizeof buf, "%s/%s", dirs[a], searchfor);
-               if (!stat(buf, &test)) {
-                       snprintf(targ, n, "%s/%s", dirs[a], searchfor);
-                       return;
-               }
-       }
-       strcpy(targ,"");
-}
-
-

diff --git a/citadel/support.h b/citadel/support.h
index 50901df8a74b343d6cdddad24f10e17f0c49e9e1..fc7c2a6aa9bc75c09273a9cf7feb6b8776aee6e1 100644 (file)
--- a/citadel/support.h
+++ b/citadel/support.h
@@ -2,5 +2,3 @@
 
 void strproc (char *string);
 int getstring (FILE *fp, char *string);
-void mesg_locate (char *targ, size_t n, const char *searchfor,
-                 int numdirs, const char * const *dirs);

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index dc74da406ec70ad977b5bb33fbf8f535af5444e9..7a4c70534edff8c7c4b7ff2097def8194db6f619 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -31,7 +31,6 @@ char ctdl_bb_dir[PATH_MAX]="bitbucket";
 char ctdl_data_dir[PATH_MAX]="data";
 char ctdl_dspam_dir[PATH_MAX]="dspam";
 char ctdl_file_dir[PATH_MAX]="files";
-char ctdl_hlp_dir[PATH_MAX]="help";
 char ctdl_shared_dir[PATH_MAX]="";
 char ctdl_image_dir[PATH_MAX]="images";
 char ctdl_info_dir[PATH_MAX]="info";
@@ -154,16 +153,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
        COMPUTE_DIRECTORY(ctdl_message_dir);
        StripSlashes(ctdl_message_dir, 1);
 
-#ifndef HAVE_HELP_DIR
-       basedir=ctdldir;
-#else
-       basedir=HELP_DIR;
-#endif
-       COMPUTE_DIRECTORY(ctdl_hlp_dir);
-       StripSlashes(ctdl_hlp_dir, 1);
-       COMPUTE_DIRECTORY(ctdl_shared_dir);
-       StripSlashes(ctdl_shared_dir, 1);
-
 #ifndef HAVE_DATA_DIR
        basedir=ctdldir;
 #else
@@ -324,7 +313,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
        DBG_PRINT(ctdl_data_dir);
        DBG_PRINT(ctdl_dspam_dir);
        DBG_PRINT(ctdl_file_dir);
-       DBG_PRINT(ctdl_hlp_dir);
        DBG_PRINT(ctdl_image_dir);
        DBG_PRINT(ctdl_info_dir);
        DBG_PRINT(ctdl_key_dir);
@@ -442,7 +430,6 @@ int create_run_directories(long UID, long GID)
 {
        int rv = 0;
        rv += create_dir(ctdl_message_dir   , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
-       rv += create_dir(ctdl_hlp_dir       , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_bb_dir        , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_file_dir      , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_spool_dir     , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);