options and config file handling

With SYSCF, the SYSCF_FILE name was overwriting the
default config file name making it unavailable for
subsequent user config file options handling.

- Keep the name of the last config file successfully opened.
- Do it without orphaning the default config file name needed
  for the next pass.

diff --git a/include/decl.h b/include/decl.h
index bacff08d9b2a5efd64b416e2621f8561c28f9973..5dea2ff432b18d5123fcf0feb6216c6a7bb7355a 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 decl.h  $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: master $:$NHDT-Revision: 1.50 $ */
+/* NetHack 3.5 decl.h  $NHDT-Date: 1427035422 2015/03/22 14:43:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.56 $ */
 /* NetHack 3.5 decl.h  $Date: 2011/12/29 20:06:27 $  $Revision: 1.44 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -184,6 +184,7 @@ E NEARDATA struct kinfo {
 
 E long done_money;
 E const char *configfile;
+E char lastconfigfile[BUFSZ];          /* used for messaging */
 E NEARDATA char plname[PL_NSIZ];
 E NEARDATA char dogname[];
 E NEARDATA char catname[];

diff --git a/src/files.c b/src/files.c
index b9942246a94643187ecab6e23d79070accfc8477..e638fa640b7abd56289e75df2366367d6203b9e9 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 files.c $NHDT-Date: 1426969026 2015/03/21 20:17:06 $  $NHDT-Branch: master $:$NHDT-Revision: 1.137 $ */
+/* NetHack 3.5 files.c $NHDT-Date: 1427035432 2015/03/22 14:43:52 $  $NHDT-Branch: master $:$NHDT-Revision: 1.138 $ */
 /* NetHack 3.5 files.c $Date: 2012/03/10 02:49:08 $  $Revision: 1.124 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1811,6 +1811,8 @@ const char *configfile =
 # endif
 #endif
 
+/* used for messaging */
+char lastconfigfile[BUFSZ];
 
 #ifdef MSDOS
 /* conflict with speed-dial under windows
@@ -1857,10 +1859,9 @@ int src;
                        /* fall through to standard names */
                } else
 #endif
-               if ((fp = fopenp(filename, "r")) != (FILE *)0) {
-#ifndef WIN32
-                   configfile = filename;
-#endif
+               (void) strncpy(lastconfigfile, filename, BUFSZ-1);
+               lastconfigfile[BUFSZ-1] = '\0';
+               if ((fp = fopenp(lastconfigfile, "r")) != (FILE *)0) {
                    return(fp);
 #if defined(UNIX) || defined(VMS)
                } else {
@@ -1874,24 +1875,32 @@ int src;
        }
 
 #if defined(MICRO) || defined(MAC) || defined(__BEOS__) || defined(WIN32)
-       if ((fp = fopenp(fqname(configfile, CONFIGPREFIX, 0), "r"))
-                                                               != (FILE *)0)
+       (void) strncpy(lastconfigfile,
+                       fqname(configfile, CONFIGPREFIX, 0), BUFSZ-1);
+       lastconfigfile[BUFSZ-1] = '\0';
+       if ((fp = fopenp(lastconfigfile, "r")) != (FILE *)0) {
                return(fp);
+       }
 # ifdef MSDOS
-       else if ((fp = fopenp(fqname(backward_compat_configfile,
-                                       CONFIGPREFIX, 0), "r")) != (FILE *)0)
+       (void) strncpy(lastconfigfile,
+                       fqname(backward_compat_configfile, CONFIGPREFIX, 0),
+                       BUFSZ-1);
+       lastconfigfile[BUFSZ-1] = '\0';
+       else if ((fp = fopenp(fqname(lastconfigfile, "r")) != (FILE *)0)
                return(fp);
 # endif
 #else
        /* constructed full path names don't need fqname() */
 # ifdef VMS
-       if ((fp = fopenp(fqname("nethackini", CONFIGPREFIX, 0), "r"))
-                                                               != (FILE *)0) {
-               configfile = "nethackini";
+       (void) strncpy(lastconfigfile, fqname("nethackini", CONFIGPREFIX, 0),
+                       BUFSZ-1);
+       lastconfigfile[BUFSZ-1] = '\0';
+       if ((fp = fopenp(lastconfigfile, "r")) != (FILE *)0) {
                return(fp);
        }
-       if ((fp = fopenp("sys$login:nethack.ini", "r")) != (FILE *)0) {
-               configfile = "nethack.ini";
+       (void) strncpy(lastconfigfile,"sys$login:nethack.ini", BUFSZ-1);
+       lastconfigfile[BUFSZ-1] = '\0';
+       if ((fp = fopenp(lastconfigfile, "r")) != (FILE *)0) {
                return(fp);
        }
 
@@ -1900,6 +1909,9 @@ int src;
                Strcpy(tmp_config, "NetHack.cnf");
        else
                Sprintf(tmp_config, "%s%s", envp, "NetHack.cnf");
+
+       (void) strncpy(lastconfigfile, tmp_config, BUFSZ-1);
+       lastconfigfile[BUFSZ-1] = '\0';
        if ((fp = fopenp(tmp_config, "r")) != (FILE *)0)
                return(fp);
 # else /* should be only UNIX left */
@@ -1908,18 +1920,25 @@ int src;
                Strcpy(tmp_config, ".nethackrc");
        else
                Sprintf(tmp_config, "%s/%s", envp, ".nethackrc");
-       if ((fp = fopenp(tmp_config, "r")) != (FILE *)0)
+
+       (void) strncpy(lastconfigfile, tmp_config, BUFSZ-1);
+       lastconfigfile[BUFSZ-1] = '\0';
+       if ((fp = fopenp(lastconfigfile, "r")) != (FILE *)0)
                return(fp);
 #  if defined(__APPLE__)
        /* try an alternative */
        if (envp) {
                Sprintf(tmp_config, "%s/%s", envp,
                        "Library/Preferences/NetHack Defaults");
-               if ((fp = fopenp(tmp_config, "r")) != (FILE *)0)
+               (void) strncpy(lastconfigfile, tmp_config, BUFSZ-1);
+               lastconfigfile[BUFSZ-1] = '\0';
+               if ((fp = fopenp(lastconfigfile, "r")) != (FILE *)0)
                        return(fp);
                Sprintf(tmp_config, "%s/%s", envp,
                        "Library/Preferences/NetHack Defaults.txt");
-               if ((fp = fopenp(tmp_config, "r")) != (FILE *)0)
+               (void) strncpy(lastconfigfile, tmp_config, BUFSZ-1);
+               lastconfigfile[BUFSZ-1] = '\0';
+               if ((fp = fopenp(lastconfigfile, "r")) != (FILE *)0)
                        return(fp);
        }
 #  endif
@@ -1934,7 +1953,7 @@ int src;
 #  endif
                details = "";
            raw_printf("Couldn't open default config file %s %s(%d).",
-                      tmp_config, details, errno);
+                      lastconfigfile, details, errno);
            wait_synch();
        }
 # endif        /* Unix */

diff --git a/src/options.c b/src/options.c
index 98ab3724bc150c9972555328051fca5987fdc8fa..c21010ab1b344188731fe62b4aeb002066c9a2bb 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 options.c       $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.158 $ */
+/* NetHack 3.5 options.c       $NHDT-Date: 1427035440 2015/03/22 14:44:00 $  $NHDT-Branch: master $:$NHDT-Revision: 1.163 $ */
 /* NetHack 3.5 options.c       $Date: 2012/04/09 02:56:30 $  $Revision: 1.153 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -798,10 +798,10 @@ rejectoption(optname)
 const char *optname;
 {
 #ifdef MICRO
-       pline("\"%s\" settable only from %s.", optname, configfile);
+       pline("\"%s\" settable only from %s.", optname, lastconfigfile);
 #else
        pline("%s can be set only from NETHACKOPTIONS or %s.", optname,
-                       configfile);
+                       lastconfigfile);
 #endif
 }
 
@@ -821,7 +821,7 @@ const char *opts;
 #endif
 
        if(from_file)
-           raw_printf("Bad syntax in OPTIONS in %s: %s.", configfile, opts);
+           raw_printf("Bad syntax in OPTIONS in %s: %s.", lastconfigfile, opts);
        else
            raw_printf("Bad syntax in NETHACKOPTIONS: %s.", opts);
 
@@ -4070,7 +4070,7 @@ option_help()
     winid datawin;
 
     datawin = create_nhwindow(NHW_TEXT);
-    Sprintf(buf, "Set options as OPTIONS=<options> in %s", configfile);
+    Sprintf(buf, "Set options as OPTIONS=<options> in %s", lastconfigfile);
     opt_intro[CONFIG_SLOT] = (const char *) buf;
     for (i = 0; opt_intro[i]; i++)
        putstr(datawin, 0, opt_intro[i]);