* create format strings different for solaris

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index f5d4750e5f9744d56e0424f73885e45f4f70ad72..35a25b8cba7867feec00d0b518b2847f2bef7bcf 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -20,8 +20,6 @@
 #include "config.h"
 
 struct config config;
-char ctdl_home_directory[PATH_MAX] = CTDLDIR;
-int home_specified = 0;
 
 /*
  * get_config() is called during the initialization of any program which
@@ -32,39 +30,40 @@ void get_config(void) {
        FILE *cfp;
        struct stat st;
 
-       if (chdir(home_specified ? ctdl_home_directory : CTDLDIR) != 0) {
+       if (chdir(ctdl_bbsbase_dir) != 0) {
                fprintf(stderr,
                        "This program could not be started.\n"
                        "Unable to change directory to %s\n"
                        "Error: %s\n",
-                       (home_specified ? ctdl_home_directory : CTDLDIR),
+                       ctdl_bbsbase_dir,
                        strerror(errno));
-               exit(1);
+               exit(CTDLEXIT_HOME);
        }
-       cfp = fopen(
-#ifndef HAVE_ETC_DIR
-                               "."
-#else
-                               ETC_DIR
-#endif
-                               "/citadel.config", "rb");
+       cfp = fopen(file_citadel_config, "rb");
        if (cfp == NULL) {
                fprintf(stderr, "This program could not be started.\n"
-                       "Unable to open %s/citadel.config\n"
-                       "Error: %s\n",
-                       (home_specified ? ctdl_home_directory : CTDLDIR),
-                       strerror(errno));
-               exit(1);
+                               "Unable to open %s\n"
+                               "Error: %s\n",
+                               file_citadel_config,
+                               strerror(errno));
+               exit(CTDLEXIT_CONFIG);
        }
        fread((char *) &config, sizeof(struct config), 1, cfp);
        if (fstat(fileno(cfp), &st)) {
-               perror("citadel.config");
-               exit(1);
+               perror(file_citadel_config);
+               exit(CTDLEXIT_CONFIG);
        }
 #ifndef __CYGWIN__
-       if (st.st_uid != CTDLUID || st.st_mode != (S_IFREG | S_IRUSR | S_IWUSR)) {
-               fprintf(stderr, "check the permissions on citadel.config\n");
-               exit(1);
+       if (st.st_uid != CTDLUID) {
+               fprintf(stderr, "%s must be owned by uid="F_UID_T" but "F_UID_T" owns it!\n", 
+                       file_citadel_config, CTDLUID, st.st_uid);
+               exit(CTDLEXIT_CONFIG);
+       }
+       int desired_mode = (S_IFREG | S_IRUSR | S_IWUSR) ;
+       if (st.st_mode != desired_mode) {
+               fprintf(stderr, "%s must be set to permissions mode %03o but they are %03o\n",
+                       file_citadel_config, desired_mode, st.st_mode);
+               exit(CTDLEXIT_CONFIG);
        }
 #endif
        fclose(cfp);
@@ -79,7 +78,7 @@ void get_config(void) {
                        "        Data files are currently at %d.%02d\n",
                        (config.c_setup_level / 100),
                        (config.c_setup_level % 100));
-               exit(1);
+               exit(CTDLEXIT_OOD);
        }
 
         /* Default maximum message length is 10 megabytes.  This is site
@@ -118,14 +117,8 @@ void put_config(void)
 {
        FILE *cfp;
 
-       if ((cfp = fopen(
-#ifndef HAVE_ETC_DIR
-                                        "."
-#else
-                                        ETC_DIR
-#endif
-                                        "/citadel.config", "rb+")) == NULL)
-               perror("citadel.config");
+       if ((cfp = fopen(file_citadel_config, "rb+")) == NULL)
+               perror(file_citadel_config);
        else {
                fwrite((char *) &config, sizeof(struct config), 1, cfp);
                fclose(cfp);