[freesci-develop] r1519 - in freesci/trunk: . src

[jameson]

Author: jameson
Date: 2006-02-05 04:31:57 +0100 (Sun, 05 Feb 2006)
New Revision: 1519

Modified:
   freesci/trunk/ChangeLog
   freesci/trunk/src/config.c
   freesci/trunk/src/config.l
   freesci/trunk/src/main.c
Log:
* Fixed fix for dealing missing configuration file

  Removed special-case handler for ~/.freesci not being accessible,
re-used general-purpose code for this.  And fixed an over-eagerness
of detecting errors as well. Hopefully this one'll work better.

-- Christoph



Modified: freesci/trunk/ChangeLog
===================================================================
--- freesci/trunk/ChangeLog     2006-02-05 03:06:53 UTC (rev 1518)
+++ freesci/trunk/ChangeLog     2006-02-05 03:31:57 UTC (rev 1519)
@@ -1,5 +1,8 @@
 2006-02-05  Christoph Reichenbach  <address@hidden>
 
+       * src/config.l (config_init): Fixed missing config file corner
+       case issue (more) correctly
+
        * configure.in: Added -lXext support for compiling on some OS X
        versions
 

Modified: freesci/trunk/src/config.c
===================================================================
--- freesci/trunk/src/config.c  2006-02-05 03:06:53 UTC (rev 1518)
+++ freesci/trunk/src/config.c  2006-02-05 03:31:57 UTC (rev 1519)
@@ -2705,6 +2705,7 @@
                        /* So we've got a home directory */
                        if (chdir(homedir)) {
                                fprintf(stderr,"Warning: Could not enter home 
directory!\n");
+                               *_conf = conf; /* Set the result variable */
                                return 1;
                        }
 
@@ -2712,6 +2713,7 @@
                                if (scimkdir(FREESCI_GAMEDIR, 0700)) {
 
                                        fprintf(stderr,"Warning: Could not 
enter/create ~/"FREESCI_GAMEDIR"\n");
+                                       *_conf = conf; /* Set the result 
variable */
                                        return 1;
                                }
 

Modified: freesci/trunk/src/config.l
===================================================================
--- freesci/trunk/src/config.l  2006-02-05 03:06:53 UTC (rev 1518)
+++ freesci/trunk/src/config.l  2006-02-05 03:31:57 UTC (rev 1519)
@@ -647,6 +647,7 @@
                        /* So we've got a home directory */
                        if (chdir(homedir)) {
                                fprintf(stderr,"Warning: Could not enter home 
directory!\n");
+                               *_conf = conf; /* Set the result variable */
                                return 1;
                        }
 
@@ -654,6 +655,7 @@
                                if (scimkdir(FREESCI_GAMEDIR, 0700)) {
 
                                        fprintf(stderr,"Warning: Could not 
enter/create ~/"FREESCI_GAMEDIR"\n");
+                                       *_conf = conf; /* Set the result 
variable */
                                        return 1;
                                }
 

Modified: freesci/trunk/src/main.c
===================================================================
--- freesci/trunk/src/main.c    2006-02-05 03:06:53 UTC (rev 1518)
+++ freesci/trunk/src/main.c    2006-02-05 03:31:57 UTC (rev 1519)
@@ -919,23 +919,16 @@
        conf_nr = read_config(game_name, &confs, &conf_entries, &version);
 
        if (game_name) {
-               if (!active_conf) {
-                       fprintf(stderr, "No configuration file 
(~/.freesci/config); you can't use game name shortcuts.\n"
-                               "Either create ~/.freesci/config (cf. README), 
or use \"-d <dirname>\"\n");
-                       exit(1);
-               } else {
+               active_conf = confs + conf_nr;
 
-                       active_conf = confs + conf_nr;
-
-                       if (!cl_options.gamedir)
-                               if (chdir(active_conf->resource_dir)) {
-                                       if (conf_nr)
-                                               fprintf(stderr,"Error entering 
'%s' to load resource data\n", active_conf->resource_dir);
-                                       else
-                                               fprintf(stderr,"Game '%s' isn't 
registered in your config file.\n", game_name);
-                                       exit(1);
-                               }
-               }
+               if (!cl_options.gamedir)
+                       if (chdir(active_conf->resource_dir)) {
+                               if (conf_nr)
+                                       fprintf(stderr,"Error entering '%s' to 
load resource data\n", active_conf->resource_dir);
+                               else
+                                       fprintf(stderr,"Game '%s' isn't 
registered in your config file.\n", game_name);
+                               exit(1);
+                       }
        }
 
        if (cl_options.gamedir)