From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9567 invoked by alias); 19 Jul 2012 07:54:01 -0000 Received: (qmail 9554 invoked by uid 22791); 19 Jul 2012 07:53:59 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Jul 2012 07:53:46 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1SrlYP-0001au-9y from Yao_Qi@mentor.com ; Thu, 19 Jul 2012 00:53:45 -0700 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 19 Jul 2012 00:53:50 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.1.289.1; Thu, 19 Jul 2012 00:53:44 -0700 From: Yao Qi To: CC: Jan Kratochvil Subject: [committed]:[obv] Handle var_string_noescape and var_optional_filename together. Date: Thu, 19 Jul 2012 07:54:00 -0000 Message-ID: <78989086.O2ThAENbim@qiyao.dyndns.org> User-Agent: KMail/4.8.3 (Linux/3.3.7-1.fc16.i686; KDE/4.8.3; i686; ; ) In-Reply-To: <20120718152615.GA20923@host2.jankratochvil.net> References: <1342636814-1674-1-git-send-email-yao@codesourcery.com> <2030807.PK0sv4maNt@qiyao.dyndns.org> <20120718152615.GA20923@host2.jankratochvil.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-07/txt/msg00320.txt.bz2 On Wednesday, July 18, 2012 05:26:15 PM Jan Kratochvil wrote: > Just it has a sort-of-regression: > (gdb) set args ~ > (gdb) show args > Argument list to give program being debugged when it is started is "~". > -> > Argument list to give program being debugged when it is started is > "/home/jkratoch". >=20 I don't see "set args ~" in testsuite, so I add it into gdb.base/setshow.ex= p. > Therefore please modify also: > add_setshow_optional_filename_cmd ("args", class_run, >=20 > to rather use add_setshow_string_noescape_cmd together with: > set_cmd_completer (set_result, filename_completer); >=20 Done as you suggested. Regression tested on x86_64 native gdb. Committed.= =20=20 Jan, thanks for the review. --=20 Yao (=E9=BD=90=E5=B0=A7) gdb: 2012-07-20 Yao Qi Jan Kratochvil * cli/cli-setshow.c (do_setshow_command): Handle case 'var_filename' and case 'var_optional_filename' together. * infcmd.c (_initialize_infcmd): Call add_setshow_string_noescape_cmd instead of add_setshow_optional_filename_cmd for setshow command 'args'. Set completer for 'set args'. gdb/testsuite: 2012-07-20 Yao Qi * gdb.base/setshow.exp: Test 'set args ~'. --- gdb/cli/cli-setshow.c | 30 +++++++++++++++--------------- gdb/infcmd.c | 15 ++++++++++----- gdb/testsuite/gdb.base/setshow.exp | 4 ++++ 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index 521ac0e..dccf425 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -182,27 +182,27 @@ do_setshow_command (char *arg, int from_tty, struct=20 cmd_list_element *c) xfree (*(char **) c->var); *(char **) c->var =3D xstrdup (arg); break; - case var_optional_filename: - if (arg =3D=3D NULL) - arg =3D ""; - if (*(char **) c->var !=3D NULL) - xfree (*(char **) c->var); - *(char **) c->var =3D xstrdup (arg); - break; case var_filename: if (arg =3D=3D NULL) error_no_arg (_("filename to set it to.")); + /* FALLTHROUGH */ + case var_optional_filename: if (*(char **) c->var !=3D NULL) xfree (*(char **) c->var); - { - /* Clear trailing whitespace of filename. */ - char *ptr =3D arg + strlen (arg) - 1; =20 - while (ptr >=3D arg && (*ptr =3D=3D ' ' || *ptr =3D=3D '\t')) - ptr--; - *(ptr + 1) =3D '\0'; - } - *(char **) c->var =3D tilde_expand (arg); + if (arg !=3D NULL) + { + /* Clear trailing whitespace of filename. */ + char *ptr =3D arg + strlen (arg) - 1; + + while (ptr >=3D arg && (*ptr =3D=3D ' ' || *ptr =3D=3D '\t')) + ptr--; + *(ptr + 1) =3D '\0'; + + *(char **) c->var =3D tilde_expand (arg); + } + else + *(char **) c->var =3D xstrdup (""); break; case var_boolean: *(int *) c->var =3D parse_binary_operation (arg); diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 475ac90..635e577 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -2918,6 +2918,7 @@ _initialize_infcmd (void) { static struct cmd_list_element *info_proc_cmdlist; struct cmd_list_element *c =3D NULL; + char *cmd_name; =20 /* Add the filename of the terminal connected to inferior I/O. */ add_setshow_filename_cmd ("inferior-tty", class_run, @@ -2930,14 +2931,18 @@ Usage: set inferior-tty /dev/pts/1"), &setlist, &showlist); add_com_alias ("tty", "set inferior-tty", class_alias, 0); =20 - add_setshow_optional_filename_cmd ("args", class_run, - &inferior_args_scratch, _("\ + cmd_name =3D "args"; + add_setshow_string_noescape_cmd (cmd_name, class_run, + &inferior_args_scratch, _("\ Set argument list to give program being debugged when it is started."), _(= "\ Show argument list to give program being debugged when it is started."), _= ("\ Follow this command with any number of args, to be passed to the program."= ), - set_args_command, - show_args_command, - &setlist, &showlist); + set_args_command, + show_args_command, + &setlist, &showlist); + c =3D lookup_cmd (&cmd_name, setlist, "", -1, 1); + gdb_assert (c !=3D NULL); + set_cmd_completer (c, filename_completer); =20 c =3D add_cmd ("environment", no_class, environment_info, _("\ The environment to give the program, or one variable's value.\n\ diff --git a/gdb/testsuite/gdb.base/setshow.exp=20 b/gdb/testsuite/gdb.base/setshow.exp index b218314..9af5c30 100644 --- a/gdb/testsuite/gdb.base/setshow.exp +++ b/gdb/testsuite/gdb.base/setshow.exp @@ -87,6 +87,10 @@ gdb_test_no_output "set annotate 0" "set annotate 0" gdb_test "show annotate" "Annotation_level is 0..*" "show annotate (0)"=20 #test annotation_level 0 gdb_test "info line 1" "Line 1 of .* is at address .* but contains no code= .*"=20=20 "annotation_level 0"=20 + +gdb_test_no_output "set args ~" +gdb_test "show args" "Argument list to give program being debugged when it= is=20 started is \"~\"..*" \ + "show args ~" #test set args gdb_test_no_output "set args foo bar blup baz bubble" "set args"=20 #test show args --=20 1.7.7.6