parsebindings() vs commas

The set-but-not-used warning for 'ret' revealed an actual bug this
time.  Parsing sysconf cares whether any errors were encountered
when parsing its contents, but BINDINGS=key1:cmd1,key2:cmd2 only
returned the result of the first key in the comma-separated list
because the result from recursive calls was lost to the set-but-
not-used variable.  Just adding use of that variable would have
ended up reporting success if any key bound succesfully rather than
requiring that they all do as sysconf parse handling intends.

Also, binding comma to a command required that it be specified by
its numeric value because parsing via recursion ate up the actual
commas.  Now allow "BINDINGS=,:cmd" or "keyM:cmdM,,:cmdN" or
"BINDINGS=\,:cmd" or "keyM:cmdM,\,:cmdN".

It also recognizes "BINDINGS=',':cmd" and "keyM:cmdM,',':cmdN" but
that yields an invalid key error for "','".  I thought txt2key()
supported that but it doesn't.  I've left this in because the error
about ',' not being recognized as a key seems better than one about
"'" not being a valid key bind and then accidentally binding single
quote via post-comma "':command".

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 9e10c24ec4010b58ff0c920dcd484da2f3401f92..a0cf984d3cfabfbee1b5482b1083b03cc1548582 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -1,4 +1,4 @@
-NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.630 $ $NHDT-Date: 1629928191 2021/08/25 21:49:51 $
+NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.734 $ $NHDT-Date: 1641673963 2022/01/08 20:32:43 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -735,6 +735,9 @@ when one leg is wounded, have ^X report which (already used plural if both)
 wand of probing used on steed ('z >') didn't include wounded leg(s) feedback
 getting wounded in one leg when the other was already wounded miraculously
        healed old leg and kept longer of their recovery timeouts for new one
+when parsing config file entry "BINDINGS=key1:cmd1,key2:cmd2,key3:cmd3" allow
+       keyN to be either a naked comma or backslash+comma instead requiring
+       that comma's numeric value be used to bind comma to a command
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --git a/src/options.c b/src/options.c
index 1b02cd8bb2c8f92112aae62ba815851ef0dfdfaa..55faf8158e34352a898926cb1cf94cfaacb9ea2f 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 options.c       $NHDT-Date: 1640991743 2021/12/31 23:02:23 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.522 $ */
+/* NetHack 3.7 options.c       $NHDT-Date: 1641673953 2022/01/08 20:32:33 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.525 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Michael Allison, 2008. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -5854,12 +5854,12 @@ initoptions_finish(void)
             /* looks like a filename */
             if (strlen(opts) < BUFSZ / 2) {
                 config_error_init(TRUE, opts, CONFIG_ERROR_SECURE);
-                read_config_file(opts, set_in_config);
+                (void) read_config_file(opts, set_in_config);
                 config_error_done();
             }
         } else {
             config_error_init(TRUE, (char *) 0, FALSE);
-            read_config_file((char *) 0, set_in_config);
+            (void) read_config_file((char *) 0, set_in_config);
             config_error_done();
             /* let the total length of options be long;
              * parseoptions() will check each individually
@@ -5872,7 +5872,7 @@ initoptions_finish(void)
 #endif /* !MAC */
     /*else*/ {
         config_error_init(TRUE, (char *) 0, FALSE);
-        read_config_file((char *) 0, set_in_config);
+        (void) read_config_file((char *) 0, set_in_config);
         config_error_done();
     }
 
@@ -6059,22 +6059,38 @@ feature_alert_opts(char *op, const char *optn)
  *
  */
 
-/* parse key:command */
+/* parse key:command[,key2:command2,...] after BINDINGS= prefix has been
+   stripped; returns False if any problem seen, True if every binding in
+   the comma-separated list is successful */
 boolean
 parsebindings(char *bindings)
 {
     char *bind;
     uchar key;
     int i;
-    boolean ret = FALSE;
+    boolean ret = TRUE; /* assume success */
 
-    /* break off first binding from the rest; parse the rest */
+    /* look for first comma, then decide whether it is the key being bound
+       or a list element separator; if it's a key, find separator beyond it */
     if ((bind = index(bindings, ',')) != 0) {
-        *bind++ = 0;
-        ret |= parsebindings(bind);
+        /* at start so it represents a key */
+        if (bind == bindings)
+            bind = index(bind + 1, ',');
+
+        /* to get here, bind is non-Null and not equal to bindings,
+           so it is greater than bindings and bind[-1] is valid; check
+           whether current comma happens to be for "\,:cmd" or "',':cmd"
+           (":cmd" part is assumed if the comma has expected quoting) */
+        else if (bind[-1] == '\\' || (bind[-1] == '\'' && bind[1] == '\''))
+            bind = index(bind + 2, ',');
+    }
+    /* if a comma separator has been found, break off first binding from rest;
+       parse the rest and then handle this first one when recursion returns */
+    if (bind) {
+        *bind++ = '\0';
+        if (!parsebindings(bind))
+            ret = FALSE;
     }
-
-    nhUse(ret);
     
     /* parse a single binding: first split around : */
     if (! (bind = index(bindings, ':')))
@@ -6092,7 +6108,7 @@ parsebindings(char *bindings)
 
     /* is it a special key? */
     if (bind_specialkey(key, bind))
-        return TRUE;
+        return ret;
 
     /* is it a menu command? */
     for (i = 0; default_menu_cmd_info[i].name; i++) {
@@ -6100,9 +6116,10 @@ parsebindings(char *bindings)
             if (illegal_menu_cmd_key(key)) {
                 config_error_add("Bad menu key %s:%s", visctrl(key), bind);
                 return FALSE;
-            } else
+            } else {
                 add_menu_cmd_alias((char) key, default_menu_cmd_info[i].cmd);
-            return TRUE;
+            }
+            return ret;
         }
     }
 
@@ -6111,7 +6128,7 @@ parsebindings(char *bindings)
         config_error_add("Unknown key binding command '%s'", bind);
         return FALSE;
     }
-    return TRUE;
+    return ret;
 }
 
 /*