This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] define_command: Don't convert command name to lower case
- From: Simon Marchi <simon dot marchi at ericsson dot com>
- To: <gdb-patches at sourceware dot org>
- Cc: <guitton at adacore dot com>
- Date: Mon, 28 Aug 2017 23:20:03 +0200
- Subject: Re: [PATCH] define_command: Don't convert command name to lower case
- Authentication-results: sourceware.org; auth=none
- Authentication-results: spf=none (sender IP is ) smtp.mailfrom=simon dot marchi at ericsson dot com;
- References: <10ded574-4f1e-728c-8205-bcb0e31d0377@ericsson.com> <1500932879-11652-1-git-send-email-simon.marchi@ericsson.com> <f84b2460-df75-9da2-638b-76d903169962@ericsson.com>
- Spamdiagnosticmetadata: NSPM
- Spamdiagnosticoutput: 1:99
On 2017-07-24 11:54 PM, Simon Marchi wrote:
> On 2017-07-24 11:47 PM, Simon Marchi wrote:
>> I think this won't be too controversial, so I went ahead and made a patch for
>> it.
>>
>> Commit
>>
>> Command names: make them case sensitive
>> 3d7b173c29900879c9a5958dd6029fd36666e57c
>>
>> made command name lookup case sensitive. However, define_command, used
>> when creating a user-defined command, converts the command name to
>> lowercase, assuming that the command name lookup works in a case
>> insensitive way. This causes user-defined commands with capital letters
>> in their name to only be callable with a lowercase version:
>>
>> (gdb) define Foo
>> Type commands for definition of "Foo".
>> End with a line saying just "end".
>> >print 1
>> >end
>> (gdb) Foo
>> Undefined command: "Foo". Try "help".
>> (gdb) foo
>> $1 = 1
>>
>> This patch removes that conversion to lowercase, so that the user can
>> call the command with the same name they provided.
>
> I forgot to mention but this would be a candidate for the 8.0 branch as well,
> since it's a regression.
>
> Simon
>
This is now pushed to master and gdb-8.0-branch. I made a small change to the test,
in order to test that multiple commands whose names differ only by case don't
interfere.
>From fd437cbc432d5421492a5b0e371750de104cce93 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Mon, 28 Aug 2017 23:05:04 +0200
Subject: [PATCH] define_command: Don't convert command name to lower case
Commit
Command names: make them case sensitive
3d7b173c29900879c9a5958dd6029fd36666e57c
made command name lookup case sensitive. However, define_command, used
when creating a user-defined command, converts the command name to
lowercase, assuming that the command name lookup works in a case
insensitive way. This causes user-defined commands with capital letters
in their name to only be callable with a lowercase version:
(gdb) define Foo
Type commands for definition of "Foo".
End with a line saying just "end".
>print 1
>end
(gdb) Foo
Undefined command: "Foo". Try "help".
(gdb) foo
$1 = 1
This patch removes that conversion to lowercase, so that the user can
call the command with the same name they provided.
gdb/ChangeLog:
* cli/cli-script.c (define_command): Don't convert command name
to lower case.
gdb/testsuite/ChangeLog:
* gdb.base/commands.exp (user_defined_command_case_sensitivity):
New proc, call it from toplevel.
---
gdb/ChangeLog | 5 +++++
gdb/cli/cli-script.c | 6 ------
gdb/testsuite/ChangeLog | 5 +++++
gdb/testsuite/gdb.base/commands.exp | 30 ++++++++++++++++++++++++++++++
4 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 39ff4ed..73106bf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-28 Simon Marchi <simon.marchi@ericsson.com>
+
+ * cli/cli-script.c (define_command): Don't convert command name
+ to lower case.
+
2017-08-25 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (ada_lookup_struct_elt_type): Remove parameter "dispp".
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 4b8ae0b..64b4c2b 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -1478,12 +1478,6 @@ define_command (char *comname, int from_tty)
comname = xstrdup (comname);
- /* If the rest of the commands will be case insensitive, this one
- should behave in the same manner. */
- for (tem = comname; *tem; tem++)
- if (isupper (*tem))
- *tem = tolower (*tem);
-
xsnprintf (tmpbuf, sizeof (tmpbuf),
"Type commands for definition of \"%s\".", comfull);
command_line_up cmds = read_command_lines (tmpbuf, from_tty, 1, 0, 0);
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 56ff191..83261df 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-28 Simon Marchi <simon.marchi@ericsson.com>
+
+ * gdb.base/commands.exp (user_defined_command_case_sensitivity):
+ New proc, call it from toplevel.
+
2017-08-23 Sergio Durigan Junior <sergiodj@redhat.com>
PR remote/21852
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index 4963743..4cd5f46 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -352,6 +352,35 @@ proc_with_prefix user_defined_command_test {} {
"display user-defined empty command"
}
+# Test that the case with which the command was defined is preserved.
+
+proc_with_prefix user_defined_command_case_sensitivity {} {
+ # Define a first command with mixed case name.
+ set test "define Homer-Simpson"
+ gdb_test_multiple $test $test {
+ -re "End with" {
+ pass $test
+ }
+ }
+
+ gdb_test "print 123\nend" "" "enter commands 1"
+
+ # Define a second command, same name but different case.
+ set test "define HomeR-SimpsoN"
+ gdb_test_multiple $test $test {
+ -re "End with" {
+ pass $test
+ }
+ }
+
+ gdb_test "print 456\nend" "" "enter commands 2"
+
+ gdb_test "Homer-Simpson" " = 123" "execute command"
+ gdb_test "HomeR-SimpsoN" " = 456" "execute command"
+ gdb_test "HOMER-SIMPSON" "Undefined command.*" "try to call in upper case"
+ gdb_test "homer-simpson" "Undefined command.*" "try to call in lower case"
+}
+
# Test that "eval" in a user-defined command expands $argc/$argN.
proc_with_prefix user_defined_command_args_eval {} {
@@ -1052,6 +1081,7 @@ if_while_breakpoint_command_test
infrun_breakpoint_command_test
breakpoint_command_test
user_defined_command_test
+user_defined_command_case_sensitivity
user_defined_command_args_eval
user_defined_command_args_stack_test
user_defined_command_manyargs_test
--
2.7.4