Removed the global variable 'home_specified'

[citadel.git] / citadel / citadel_dirs.c

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index e4255823c652189c5a591fa544837dffdc3cd906..f4233cefb9f91781dc15f2b3158df955c6137c98 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -30,6 +30,7 @@ char ctdl_home_directory[PATH_MAX] = "";
 char ctdl_bio_dir[PATH_MAX]="bio";
 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_image_dir[PATH_MAX]="images";
@@ -59,25 +60,17 @@ char file_arcq[PATH_MAX]="";
 char file_citadel_socket[PATH_MAX]="";
 char file_mail_aliases[PATH_MAX]="";
 char file_pid_file[PATH_MAX]="";
+char file_pid_paniclog[PATH_MAX]="";
 char file_crpt_file_key[PATH_MAX]="";
 char file_crpt_file_csr[PATH_MAX]="";
 char file_crpt_file_cer[PATH_MAX]="";
 char file_chkpwd[PATH_MAX]="";
 char file_base64[PATH_MAX]="";
+char file_funambol_msg[PATH_MAX] = "";
+char file_dpsam_conf[PATH_MAX] = "";
+char file_dspam_log[PATH_MAX] = "";
 
-int home_specified = 0;
 
-
-
-
-
-
-
-
-
-       /* calculate all our path on a central place */
-    /* where to keep our config */
-       
 #define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
        snprintf(SUBDIR,sizeof SUBDIR,  "%s%s%s%s%s%s%s", \
                         (home&!relh)?ctdl_home_directory:basedir, \
@@ -88,7 +81,10 @@ int home_specified = 0;
                         dirbuffer,\
                         (dirbuffer[0]!='\0')?"/":"");
 
-void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdldir)
+#define DBG_PRINT(A) if (dbg==1) fprintf (stderr,"%s : %s \n", #A, A)
+
+
+void calc_dirs_n_files(int relh, int home, const char *relhome, const char  *ctdldir, int dbg)
 {
        const char* basedir = "";
        char dirbuffer[PATH_MAX] = "";
@@ -101,8 +97,8 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, "/usr/sbin/");
        snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, "/usr/bin/");
 #else
-       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, basedir);
-       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, basedir);
+       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, ctdldir);
+       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, ctdldir);
 #endif
 
 #ifndef HAVE_ETC_DIR
@@ -143,6 +139,7 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        COMPUTE_DIRECTORY(ctdl_bio_dir);
        COMPUTE_DIRECTORY(ctdl_bb_dir);
        COMPUTE_DIRECTORY(ctdl_data_dir);
+       COMPUTE_DIRECTORY(ctdl_dspam_dir);
        COMPUTE_DIRECTORY(ctdl_file_dir);
        COMPUTE_DIRECTORY(ctdl_image_dir);
        COMPUTE_DIRECTORY(ctdl_info_dir);
@@ -195,10 +192,13 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
                                "%scitadel.socket",
                         ctdl_run_dir);
        snprintf(file_pid_file, 
-                        sizeof file_pid_file,
-                               "%scitadel.pid",
-                        ctdl_run_dir);
-
+                sizeof file_pid_file,
+                "%scitadel.pid",
+                ctdl_run_dir);
+       snprintf(file_pid_paniclog, 
+                sizeof file_pid_paniclog, 
+                "%spanic.log",
+                ctdl_home_directory);
        snprintf(file_crpt_file_key,
                 sizeof file_crpt_file_key, 
                 "%s/citadel.key",
@@ -215,28 +215,78 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        snprintf(file_chkpwd,
                 sizeof file_chkpwd, 
                 "%schkpwd",
-                ctdl_sbin_dir);
+                ctdl_utilbin_dir);
 
        snprintf(file_base64,
-                sizeof file_chkpwd,
+                sizeof file_base64,
                 "%sbase64",
                 ctdl_utilbin_dir);
 
-
+       snprintf(file_dpsam_conf,
+                sizeof file_dpsam_conf,
+                "%sdspam.conf",
+                ctdl_etc_dir);
+       snprintf(file_dspam_log, 
+                sizeof file_dspam_log, 
+                "%sdspam.log",
+                ctdl_home_directory);
+       
        /* 
         * DIRTY HACK FOLLOWS! due to configs in the network dir in the 
         * legacy installations, we need to calculate ifdeffed here.
         */
-               snprintf(file_mail_aliases, 
-                                sizeof file_mail_aliases,
-                                "%smail.aliases",
+       snprintf(file_mail_aliases, 
+                sizeof file_mail_aliases,
+                "%smail.aliases",
 #ifdef HAVE_ETC_DIR
-                                ctdl_etc_dir
+                ctdl_etc_dir
 #else
-                                ctdl_spool_dir
+                ctdl_spool_dir
 #endif
-                                );
-
+               );
+                
+        snprintf(file_funambol_msg,
+                sizeof file_funambol_msg,
+                "%sfunambol_newmail_soap.xml",
+                ctdl_spool_dir);
+        
+       DBG_PRINT(ctdl_bio_dir);
+       DBG_PRINT(ctdl_bb_dir);
+       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);
+       DBG_PRINT(ctdl_message_dir);
+       DBG_PRINT(ctdl_usrpic_dir);
+       DBG_PRINT(ctdl_etc_dir);
+       DBG_PRINT(ctdl_run_dir);
+       DBG_PRINT(ctdl_spool_dir);
+       DBG_PRINT(ctdl_netout_dir);
+       DBG_PRINT(ctdl_netin_dir);
+       DBG_PRINT(ctdl_netcfg_dir);
+       DBG_PRINT(ctdl_bbsbase_dir);
+       DBG_PRINT(ctdl_sbin_dir);
+       DBG_PRINT(ctdl_bin_dir);
+       DBG_PRINT(ctdl_utilbin_dir);
+       DBG_PRINT(file_citadel_control);
+       DBG_PRINT(file_citadel_rc);
+       DBG_PRINT(file_citadel_config);
+       DBG_PRINT(file_lmtp_socket);
+       DBG_PRINT(file_lmtp_unfiltered_socket);
+       DBG_PRINT(file_arcq);
+       DBG_PRINT(file_citadel_socket);
+       DBG_PRINT(file_mail_aliases);
+       DBG_PRINT(file_pid_file);
+       DBG_PRINT(file_pid_paniclog);
+       DBG_PRINT(file_crpt_file_key);
+       DBG_PRINT(file_crpt_file_csr);
+       DBG_PRINT(file_crpt_file_cer);
+       DBG_PRINT(file_chkpwd);
+       DBG_PRINT(file_base64);
+       DBG_PRINT(file_funambol_msg);
 }