* Fixed a problem that crashed the client during <G>oto commands if a room

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 87f4f49f3dafd26fb3f7aa46aaed283457dbc39c..0bc223a3580b308b9c17ae098393db416ebadeab 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -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,7 +57,8 @@ void get_config(void) {
                exit(1);
        }
        fclose(cfp);
-       if (config.c_setup_level != REV_LEVEL) {
+
+       if (config.c_setup_level < REV_MIN) {
                fprintf(stderr, "config: Your data files are out of date.  ");
                fprintf(stderr, "Run setup to update them.\n");
                fprintf(stderr,
@@ -66,6 +70,25 @@ 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 lower and upper limits on number of worker threads */
+
+       if (config.c_min_workers < 3)           /* no less than 3 */
+               config.c_min_workers = 5;
+
+       if (config.c_max_workers == 0)                  /* default maximum */
+               config.c_max_workers = 256;
+
+       if (config.c_max_workers < config.c_min_workers)   /* max >= min */
+               config.c_max_workers = config.c_min_workers;
 }