* Began (but did not finish) applying GPL3+ declarations to each source file. This...

[citadel.git] / citadel / citadel_dirs.c

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index fe187f019d017495b2ffccb622d04f41deeef3bf..9bc46c8e917cc4f9fc7e4dd3dfb254c4bfe093c3 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -1,5 +1,22 @@
-#include "sysdep.h"
-#include <stdlib.h>
+/*
+ * citadel_dirs.c : calculate pathnames for various files used in the Citadel system
+ *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -33,6 +50,7 @@ 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";
 char ctdl_key_dir[PATH_MAX]=SSL_DIR;
@@ -40,6 +58,7 @@ char ctdl_message_dir[PATH_MAX]="messages";
 char ctdl_usrpic_dir[PATH_MAX]="userpics";
 char ctdl_bbsbase_dir[PATH_MAX]="";
 char ctdl_etc_dir[PATH_MAX]="";
+char ctdl_autoetc_dir[PATH_MAX]="";
 /* attention! this may be non volatile on some oses */
 char ctdl_run_dir[PATH_MAX]="";
 char ctdl_spool_dir[PATH_MAX]="network";
@@ -74,32 +93,6 @@ char file_dspam_log[PATH_MAX] = "";
 
 
 
-void StripSlashes(char *Dir, int TrailingSlash)
-{
-       char *a, *b;
-
-       a = b = Dir;
-
-       while (!IsEmptyStr(a)) {
-               if (*a == '/') {
-                       while (*a == '/')
-                               a++;
-                       *b = '/';
-                       b++;
-               }
-               else {
-                       *b = *a;
-                       b++; a++;
-               }
-       }
-       if ((TrailingSlash) && (*(b - 1) != '/')){
-               *b = '/';
-               b++;
-       }
-       *b = '\0';
-
-}
-
 
 #define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
        snprintf(SUBDIR,sizeof SUBDIR,  "%s%s%s%s%s%s%s", \
@@ -133,6 +126,15 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 #endif
        StripSlashes(ctdl_sbin_dir, 1);
        StripSlashes(ctdl_bin_dir, 1);
+
+#ifndef HAVE_AUTO_ETC_DIR
+       basedir=ctdldir;
+#else
+       basedir=AUTO_ETC_DIR;
+#endif
+       COMPUTE_DIRECTORY(ctdl_autoetc_dir);
+       StripSlashes(ctdl_autoetc_dir, 1);
+
 #ifndef HAVE_ETC_DIR
        basedir=ctdldir;
 #else
@@ -174,6 +176,8 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 #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;
@@ -218,18 +222,18 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
        snprintf(file_arcq, 
                         sizeof file_arcq,
                         "%srefcount_adjustments.dat",
-                        ctdl_etc_dir);
+                        ctdl_autoetc_dir);
        StripSlashes(file_arcq, 0);
        snprintf(file_citadel_control, 
                         sizeof file_citadel_control,
                         "%scitadel.control",
-                        ctdl_etc_dir
+                        ctdl_autoetc_dir
                         );
        StripSlashes(file_citadel_control, 0);
        snprintf(file_citadel_config, 
                         sizeof file_citadel_config,
                         "%scitadel.config",
-                        ctdl_etc_dir);
+                        ctdl_autoetc_dir);
        StripSlashes(file_citadel_config, 0);
        snprintf(file_citadel_rc, 
                         sizeof file_citadel_rc,
@@ -318,7 +322,7 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
         snprintf(file_funambol_msg,
                 sizeof file_funambol_msg,
                 "%sfunambol_newmail_soap.xml",
-                ctdl_spool_dir);
+                ctdl_shared_dir);
        StripSlashes(file_funambol_msg, 0);
 
        DBG_PRINT(ctdl_bio_dir);