/*
* citadel_dirs.c : calculate pathnames for various files used in the Citadel system
*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 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.
/* our directories... */
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_shared_dir[PATH_MAX]="";
char ctdl_image_dir[PATH_MAX]="images";
char ctdl_info_dir[PATH_MAX]="info";
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
basedir=DATA_DIR;
#endif
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_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(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);
int create_run_directories(long UID, long GID)
{
- int rv;
-
- rv = create_dir(ctdl_info_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_usrpic_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_message_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_hlp_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_image_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_bb_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_file_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_spool_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_netout_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_netin_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_netdigest_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_nettmp_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_key_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
- if (rv != -1)
- rv = create_dir(ctdl_run_dir , S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH, UID, GID);
+ int rv = 0;
+ rv += create_dir(ctdl_message_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);
+ rv += create_dir(ctdl_netout_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
+ rv += create_dir(ctdl_netin_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
+ rv += create_dir(ctdl_netdigest_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
+ rv += create_dir(ctdl_nettmp_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
+ rv += create_dir(ctdl_key_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
+ rv += create_dir(ctdl_run_dir , S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH, UID, GID);
return rv;
}