X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel_dirs.h;h=7288f25ae729c13747feb3c1e1311e19f1878bc5;hb=7a65130ea2a5be56603233ba7b8d230691f604a0;hp=1eb0a1138cd7d84006aa34561386092a936d9158;hpb=15e5e9fa5d67fd415fac5962a62fabf5d8a9e3dc;p=citadel.git

diff --git a/citadel/citadel_dirs.h b/citadel/citadel_dirs.h
index 1eb0a1138..7288f25ae 100644
--- a/citadel/citadel_dirs.h
+++ b/citadel/citadel_dirs.h
@@ -3,56 +3,44 @@
 
 #include <limits.h>
 
-
-extern char ctdl_home_directory[PATH_MAX];
-extern int home_specified;
-
-
-/* all our directories */
-extern char ctdl_bio_dir[PATH_MAX];
-extern char ctdl_bb_dir[PATH_MAX];
-extern char ctdl_data_dir[PATH_MAX];
-extern char ctdl_file_dir[PATH_MAX];
-extern char ctdl_hlp_dir[PATH_MAX];
-extern char ctdl_image_dir[PATH_MAX];
-extern char ctdl_info_dir[PATH_MAX];
-extern char ctdl_key_dir[PATH_MAX];
-extern char ctdl_message_dir[PATH_MAX];
-extern char ctdl_usrpic_dir[PATH_MAX];
-extern char ctdl_etc_dir[PATH_MAX];
-extern char ctdl_run_dir[PATH_MAX];
-extern char ctdl_spool_dir[PATH_MAX];
-extern char ctdl_netout_dir[PATH_MAX];
-extern char ctdl_netin_dir[PATH_MAX];
-extern char ctdl_netcfg_dir[PATH_MAX];
-extern char ctdl_bbsbase_dir[PATH_MAX];
-extern char ctdl_sbin_dir[PATH_MAX];
-extern char ctdl_bin_dir[PATH_MAX];
-extern char ctdl_utilbin_dir[PATH_MAX];
-extern char ctdl_key_dir[PATH_MAX];
-
-
-/* some of the frequently used files */
-extern char file_citadel_control[PATH_MAX];
-extern char file_citadel_rc[PATH_MAX];
-extern char file_citadel_config[PATH_MAX];
-extern char file_lmtp_socket[PATH_MAX];
-extern char file_lmtp_unfiltered_socket[PATH_MAX];
-extern char file_arcq[PATH_MAX];
-extern char file_citadel_socket[PATH_MAX];
-extern char file_mail_aliases[PATH_MAX];
-extern char file_pid_file[PATH_MAX];
-extern char file_pid_paniclog[PATH_MAX];
-extern char file_crpt_file_key[PATH_MAX];
-extern char file_crpt_file_csr[PATH_MAX];
-extern char file_crpt_file_cer[PATH_MAX];
-extern char file_chkpwd[PATH_MAX];
-extern char file_base64[PATH_MAX];
-
-extern void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdldir);
-
-
-void assoc_file_name(char *buf, size_t n,
-		     struct ctdlroom *qrbuf, const char *prefix);
+/* Fixed directory names (some of these are obsolete and used only for migration) */
+#define ctdl_home_directory	"."
+#define ctdl_db_dir		"data"
+#define ctdl_file_dir		"files"
+#define ctdl_shared_dir		"."
+#define ctdl_image_dir		"images"
+#define ctdl_info_dir		"info"
+#define ctdl_key_dir		"keys"
+#define ctdl_message_dir	"messages"
+#define ctdl_usrpic_dir		"userpics"
+#define ctdl_autoetc_dir	"."
+#define ctdl_run_dir		"."
+#define ctdl_netcfg_dir		"netconfigs"
+#define ctdl_bbsbase_dir	"."
+#define ctdl_sbin_dir		"."
+#define ctdl_bin_dir		"."
+#define ctdl_utilbin_dir	"."
+
+/* Fixed file names (some of these are obsolete and used only for migration) */
+#define file_citadel_config		"citadel.config"
+#define file_lmtp_socket		"lmtp.socket"
+#define file_lmtp_unfiltered_socket	"lmtp-unfiltered.socket"
+#define file_arcq			"refcount_adjustments.dat"
+#define file_citadel_socket		"citadel.socket"
+#define file_citadel_admin_socket	"citadel-admin.socket"
+#define file_pid_file			"/var/run/citserver.pid"
+#define file_pid_paniclog		"panic.log"
+#define file_crpt_file_key		"keys/citadel.key"
+#define file_crpt_file_csr		"keys/citadel.csr"
+#define file_crpt_file_cer		"keys/citadel.cer"
+#define file_chkpwd			"chkpwd"
+#define file_guesstimezone		"guesstimezone.sh"
+
+
+/* externs */
+extern int create_run_directories(long UID, long GUID);
+extern size_t assoc_file_name(char *buf, size_t n, struct ctdlroom *qrbuf, const char *prefix);
+extern FILE *create_digest_file(struct ctdlroom *room, int forceCreate);
+extern void remove_digest_file(struct ctdlroom *room);
 
 #endif /* __CITADEL_DIRS_H */