* Changed 'number of worker threads' from a sysconfig.h #define to an actual

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index e178561b06294629b56ec1e455007ddc42fb0aab..3b81fec3f1fcb67fbf64ba28ac1759a722a9c2da 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -17,7 +17,7 @@
 #include "config.h"
 
 struct config config;
-char bbs_home_directory[PATH_MAX];
+char bbs_home_directory[PATH_MAX] = BBSDIR;
 int home_specified = 0;
 
 /*
@@ -31,15 +31,18 @@ void get_config(void) {
 
        if (chdir(home_specified ? bbs_home_directory : BBSDIR) != 0) {
                fprintf(stderr,
-                "Cannot start.\nThere is no Citadel installation in %s\n%s\n",
+                       "This program could not be started.\n"
+                       "Unable to change directory to %s\n"
+                       "Error: %s\n",
                        (home_specified ? bbs_home_directory : BBSDIR),
                        strerror(errno));
                exit(1);
        }
        cfp = fopen("citadel.config", "rb");
        if (cfp == NULL) {
-               fprintf(stderr, "Cannot start.\n");
-               fprintf(stderr, "There is no citadel.config in %s\n%s\n",
+               fprintf(stderr, "This program could not be started.\n"
+                       "Unable to open %s/citadel.config\n"
+                       "Error: %s\n",
                        (home_specified ? bbs_home_directory : BBSDIR),
                        strerror(errno));
                exit(1);
@@ -54,6 +57,7 @@ void get_config(void) {
                exit(1);
        }
        fclose(cfp);
+
        if (config.c_setup_level != REV_LEVEL) {
                fprintf(stderr, "config: Your data files are out of date.  ");
                fprintf(stderr, "Run setup to update them.\n");
@@ -66,6 +70,23 @@ void get_config(void) {
                        (config.c_setup_level % 100));
                exit(1);
        }
+
+        /* Default maximum message length is 'unlimited' (max int)
+         * and the minimum is 8192
+         */
+        if (config.c_maxmsglen <= 0)
+                config.c_maxmsglen = INT_MAX;
+        if (config.c_maxmsglen < 8192)
+                config.c_maxmsglen = 8192;
+
+        /* Default number of worker threads is 15 and the minimum is 5
+         */
+       /* Can't have fewer than two worker threads */
+       if (config.c_worker_threads == 0)
+               config.c_worker_threads = 15;
+       if (config.c_worker_threads < 5)
+               config.c_worker_threads = 5;
+               
 }