diff options
| -rw-r--r-- | gdb/cli/cli-setshow.c | 15 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/settings.exp | 10 |
2 files changed, 18 insertions, 7 deletions
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index 9d6479ffca2..76bc2a3d751 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -54,18 +54,21 @@ parse_auto_binary_operation (const char *arg) while (isspace (arg[length - 1]) && length > 0) length--; - if (strncmp (arg, "on", length) == 0 + + /* Note that "o" is ambiguous. */ + + if ((length == 2 && strncmp (arg, "on", length) == 0) || strncmp (arg, "1", length) == 0 || strncmp (arg, "yes", length) == 0 || strncmp (arg, "enable", length) == 0) return AUTO_BOOLEAN_TRUE; - else if (strncmp (arg, "off", length) == 0 + else if ((length >= 2 && strncmp (arg, "off", length) == 0) || strncmp (arg, "0", length) == 0 || strncmp (arg, "no", length) == 0 || strncmp (arg, "disable", length) == 0) return AUTO_BOOLEAN_FALSE; else if (strncmp (arg, "auto", length) == 0 - || (strncmp (arg, "-1", length) == 0 && length > 1)) + || (length > 1 && strncmp (arg, "-1", length) == 0)) return AUTO_BOOLEAN_AUTO; } error (_("\"on\", \"off\" or \"auto\" expected.")); @@ -87,12 +90,14 @@ parse_cli_boolean_value (const char *arg) while (arg[length - 1] == ' ' || arg[length - 1] == '\t') length--; - if (strncmp (arg, "on", length) == 0 + /* Note that "o" is ambiguous. */ + + if ((length == 2 && strncmp (arg, "on", length) == 0) || strncmp (arg, "1", length) == 0 || strncmp (arg, "yes", length) == 0 || strncmp (arg, "enable", length) == 0) return 1; - else if (strncmp (arg, "off", length) == 0 + else if ((length >= 2 && strncmp (arg, "off", length) == 0) || strncmp (arg, "0", length) == 0 || strncmp (arg, "no", length) == 0 || strncmp (arg, "disable", length) == 0) diff --git a/gdb/testsuite/gdb.base/settings.exp b/gdb/testsuite/gdb.base/settings.exp index 365f39ea2f9..ad945a8ccbe 100644 --- a/gdb/testsuite/gdb.base/settings.exp +++ b/gdb/testsuite/gdb.base/settings.exp @@ -191,13 +191,16 @@ proc_with_prefix test-boolean {} { gdb_test "$set_cmd auto" \ "\"on\" or \"off\" expected\\." + # "o" is ambiguous. + gdb_test "$set_cmd o" \ + "\"on\" or \"off\" expected\\." + # Various valid values. Test both full value names and # abbreviations. # Note that unlike with auto-bool, empty value implies "on". foreach_with_prefix value { "" - "o" "on" "1" "y" @@ -275,11 +278,14 @@ proc_with_prefix test-auto-boolean {} { gdb_test "$set_cmd on 1" \ "\"on\", \"off\" or \"auto\" expected\\." + # "o" is ambiguous. + gdb_test "$set_cmd o" \ + "\"on\", \"off\" or \"auto\" expected\\." + # Various valid values. Test both full value names and # abbreviations. foreach_with_prefix value { - "o" "on" "1" "y" |