X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel_dirs.c;h=9d7085bb711ad3b6a0b0c263836968a20a7b1b1f;hb=973a2dae902c5d7c5f89754d538749bec0de71af;hp=8a41feadef7cfb498cd0de39b5345adcfd46e883;hpb=9c1eff5ff3656870fdf4cad4e95566b9bbef311f;p=citadel.git diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c index 8a41feade..9d7085bb7 100644 --- a/citadel/citadel_dirs.c +++ b/citadel/citadel_dirs.c @@ -20,7 +20,7 @@ #endif #include - +#include #include "citadel.h" @@ -30,22 +30,26 @@ 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"; char ctdl_info_dir[PATH_MAX]="info"; -char ctdl_key_dir[PATH_MAX]="keys"; +char ctdl_key_dir[PATH_MAX]=SSL_DIR; 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"; char ctdl_netout_dir[PATH_MAX]="network/spoolout"; char ctdl_netin_dir[PATH_MAX]="network/spoolin"; char ctdl_netcfg_dir[PATH_MAX]="netconfigs"; -char ctdl_sbin_dir[PATH_MAX]; -char ctdl_bin_dir[PATH_MAX]; +char ctdl_utilbin_dir[PATH_MAX]=""; +char ctdl_sbin_dir[PATH_MAX]=""; +char ctdl_bin_dir[PATH_MAX]=""; /* some of our files, that are needed in several places */ char file_citadel_control[PATH_MAX]=""; @@ -53,21 +57,51 @@ char file_citadel_rc[PATH_MAX]=""; char file_citadel_config[PATH_MAX]=""; char file_lmtp_socket[PATH_MAX]=""; char file_lmtp_unfiltered_socket[PATH_MAX]=""; +char file_arcq[PATH_MAX]=""; +char file_citadel_socket[PATH_MAX]=""; char file_mail_aliases[PATH_MAX]=""; - -int home_specified = 0; - - +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_guesstimezone[PATH_MAX]=""; +char file_funambol_msg[PATH_MAX] = ""; +char file_dpsam_conf[PATH_MAX] = ""; +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'; +} - /* 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, \ @@ -78,7 +112,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, char *ctdldir, int dbg) { const char* basedir = ""; char dirbuffer[PATH_MAX] = ""; @@ -87,13 +124,24 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char *ctdl * Ok, we keep our binaries either in the citadel base dir, * or in /usr/sbin / /usr/bin */ + StripSlashes(ctdldir, 1); #ifdef HAVE_ETC_DIR 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 + 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; @@ -102,6 +150,16 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char *ctdl #endif COMPUTE_DIRECTORY(ctdl_netcfg_dir); COMPUTE_DIRECTORY(ctdl_etc_dir); + StripSlashes(ctdl_netcfg_dir, 1); + StripSlashes(ctdl_etc_dir, 1); + +#ifndef HAVE_UTILBIN_DIR + basedir=ctdldir; +#else + basedir=UTILBIN_DIR; +#endif + COMPUTE_DIRECTORY(ctdl_utilbin_dir); + StripSlashes(ctdl_utilbin_dir, 1); #ifndef HAVE_RUN_DIR basedir=ctdldir; @@ -109,6 +167,23 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char *ctdl basedir=RUN_DIR; #endif COMPUTE_DIRECTORY(ctdl_run_dir); + StripSlashes(ctdl_run_dir, 1); + +#ifndef HAVE_STATICDATA_DIR + basedir=ctdldir; +#else + basedir=STATICDATA_DIR; +#endif + 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); #ifndef HAVE_DATA_DIR basedir=ctdldir; @@ -118,13 +193,23 @@ 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_hlp_dir); COMPUTE_DIRECTORY(ctdl_image_dir); COMPUTE_DIRECTORY(ctdl_info_dir); - COMPUTE_DIRECTORY(ctdl_message_dir); COMPUTE_DIRECTORY(ctdl_usrpic_dir); COMPUTE_DIRECTORY(ctdl_bbsbase_dir); + + StripSlashes(ctdl_bio_dir, 1); + StripSlashes(ctdl_bb_dir, 1); + StripSlashes(ctdl_data_dir, 1); + StripSlashes(ctdl_dspam_dir, 1); + StripSlashes(ctdl_file_dir, 1); + StripSlashes(ctdl_image_dir, 1); + StripSlashes(ctdl_info_dir, 1); + StripSlashes(ctdl_usrpic_dir, 1); + StripSlashes(ctdl_bbsbase_dir, 1); + #ifndef HAVE_SPOOL_DIR basedir=ctdldir; #else @@ -134,49 +219,156 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char *ctdl COMPUTE_DIRECTORY(ctdl_netout_dir); COMPUTE_DIRECTORY(ctdl_netin_dir); + StripSlashes(ctdl_spool_dir, 1); + StripSlashes(ctdl_netout_dir, 1); + StripSlashes(ctdl_netin_dir, 1); + /* ok, now we know the dirs, calc some commonly used files */ + snprintf(file_arcq, + sizeof file_arcq, + "%srefcount_adjustments.dat", + 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, "%scitadel.rc", ctdl_etc_dir); - + StripSlashes(file_citadel_rc, 0); snprintf(file_lmtp_socket, sizeof file_lmtp_socket, "%slmtp.socket", ctdl_run_dir); - + StripSlashes(file_lmtp_socket, 0); snprintf(file_lmtp_unfiltered_socket, sizeof file_lmtp_socket, "%slmtp-unfiltered.socket", ctdl_run_dir); - - + StripSlashes(file_lmtp_unfiltered_socket, 0); + snprintf(file_citadel_socket, + sizeof file_citadel_socket, + "%scitadel.socket", + ctdl_run_dir); + StripSlashes(file_citadel_socket, 0); + snprintf(file_pid_file, + sizeof file_pid_file, + "%scitadel.pid", + ctdl_run_dir); + StripSlashes(file_pid_file, 0); + snprintf(file_pid_paniclog, + sizeof file_pid_paniclog, + "%spanic.log", + ctdl_home_directory); + StripSlashes(file_pid_paniclog, 0); + snprintf(file_crpt_file_key, + sizeof file_crpt_file_key, + "%s/citadel.key", + ctdl_key_dir); + StripSlashes(file_crpt_file_key, 0); + snprintf(file_crpt_file_csr, + sizeof file_crpt_file_csr, + "%s/citadel.csr", + ctdl_key_dir); + StripSlashes(file_crpt_file_csr, 0); + snprintf(file_crpt_file_cer, + sizeof file_crpt_file_cer, + "%s/citadel.cer", + ctdl_key_dir); + StripSlashes(file_crpt_file_cer, 0); + snprintf(file_chkpwd, + sizeof file_chkpwd, + "%schkpwd", + ctdl_utilbin_dir); + StripSlashes(file_chkpwd, 0); + snprintf(file_base64, + sizeof file_base64, + "%sbase64", + ctdl_utilbin_dir); + StripSlashes(file_base64, 0); + snprintf(file_guesstimezone, + sizeof file_guesstimezone, + "%sguesstimezone.sh", + ctdl_utilbin_dir); + + snprintf(file_dpsam_conf, + sizeof file_dpsam_conf, + "%sdspam.conf", + ctdl_etc_dir); + StripSlashes(file_dpsam_conf, 0); + snprintf(file_dspam_log, + sizeof file_dspam_log, + "%sdspam.log", + ctdl_home_directory); + StripSlashes(file_dspam_log, 0); /* * 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 - ); - + ); + StripSlashes(file_mail_aliases, 0); + snprintf(file_funambol_msg, + sizeof file_funambol_msg, + "%sfunambol_newmail_soap.xml", + ctdl_spool_dir); + StripSlashes(file_funambol_msg, 0); + + 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_guesstimezone); + DBG_PRINT(file_funambol_msg); }