From: Simon Marchi <simark@simark.ca>
To: Michael Weghorn <m.weghorn@posteo.de>,
Christian Biesinger <cbiesinger@google.com>,
gdb-patches <gdb-patches@sourceware.org>
Subject: Re: [PATCH v2 1/4] gdbsupport: Extend construct_inferior_arguments to allow handling all stringify_args cases
Date: Thu, 7 May 2020 15:49:06 -0400 [thread overview]
Message-ID: <ab6edbbb-b6ea-e2ba-6af9-672cd12df6f2@simark.ca> (raw)
In-Reply-To: <a07cee89-df65-8abb-5da9-84907071f8f9@posteo.de>
Hi Michael,
I think the patch looks good, there are just a few nits to fix, and a suggestion.
> diff --git a/gdb/infcmd.c b/gdb/infcmd.c
> index 8f7482347c..3ac64b3164 100644
> --- a/gdb/infcmd.c
> +++ b/gdb/infcmd.c
> @@ -151,12 +151,9 @@ get_inferior_args (void)
> {
> if (current_inferior ()->argc != 0)
> {
> - char *n;
> -
> - n = construct_inferior_arguments (current_inferior ()->argc,
> + std::string n = construct_inferior_arguments (current_inferior ()->argc,
> current_inferior ()->argv);
Align the last line with the parenthesis, like it was before the change.
> - set_inferior_args (n);
> - xfree (n);
> + set_inferior_args (n.c_str());
Space before parenthesis.
> }
>
> if (current_inferior ()->args == NULL)
> diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc
> index 71b9a11e02..3f117d5ef0 100644
> --- a/gdbsupport/common-inferior.cc
> +++ b/gdbsupport/common-inferior.cc
> @@ -28,15 +28,15 @@ bool startup_with_shell = true;
> /* Compute command-line string given argument vector. This does the
> same shell processing as fork_inferior. */
>
> -char *
> -construct_inferior_arguments (int argc, char **argv)
> +std::string
> +construct_inferior_arguments (int argc, char * const *argv)
> {
> - char *result;
> + gdb_assert (argc >= 0);
> + if (argc == 0 || argv[0] == NULL) {
> + return "";
> + }
Omit the braces when there is just one single line statement.
When there are braces, places them like this:
if (condition)
{
stmt1;
stmt2;
}
Did you actually encounter the case (argc > 0 && argv[0] == NULL)? In
other words, does it really constitute a valid input to this function?
>
> - /* ARGC should always be at least 1, but we double check this
> - here. This is also needed to silence -Werror-stringop
> - warnings. */
> - gdb_assert (argc > 0);
> + char *result;
>
> if (startup_with_shell)
> {
> @@ -145,5 +145,8 @@ construct_inferior_arguments (int argc, char **argv)
> }
> }
>
> - return result;
> + std::string str_result(result);
Space before parenthesis.
If we are going to return a string anyway, I'd vote for building the result
into an std::string directly. You can remove the part that tries to guess
the length of the string, and use the appropriate std::string methods /
operators to append to it.
If you do this, I'm thinking that the `argc == 0` check at the beginning of
the function might be unnecessary, as the code could handle it naturally:
all the loops will be skipped and we'll return an empty string.
Thanks,
Simon
next prev parent reply other threads:[~2020-05-07 19:49 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 11:16 Patches for PR 25893 "gdbserver incorrectly handles program args containing space" Michael Weghorn
2020-04-29 11:16 ` [PATCH 0/4] gdb: Move construct_inferior_arguments to gdbsupport Michael Weghorn
2020-05-07 19:31 ` Simon Marchi
2020-05-12 15:50 ` Michael Weghorn
2020-04-29 11:16 ` [PATCH 1/4] gdbsupport: Extend construct_inferior_arguments to allow handling all stringify_args cases Michael Weghorn
2020-04-29 15:25 ` Christian Biesinger
2020-04-29 15:45 ` Christian Biesinger
2020-05-07 19:29 ` Simon Marchi
2020-05-12 15:48 ` Michael Weghorn
2020-05-12 16:11 ` Simon Marchi
2020-05-12 16:24 ` Michael Weghorn
2020-04-30 6:02 ` [PATCH v2 " Michael Weghorn
2020-05-07 19:49 ` Simon Marchi [this message]
2020-05-12 15:57 ` Michael Weghorn
2020-04-29 11:16 ` [PATCH 2/4] gdbserver: Don't add extra NULL to program args Michael Weghorn
2020-05-07 19:54 ` Simon Marchi
2020-05-12 16:00 ` Michael Weghorn
2020-04-29 11:16 ` [PATCH 3/4] [PR gdbserver/25893]: Use construct_inferior_arguments which handles special chars Michael Weghorn
2020-05-07 20:09 ` Simon Marchi
2020-05-07 22:09 ` Simon Marchi
2020-05-12 16:10 ` Michael Weghorn
2020-05-12 16:07 ` Michael Weghorn
2020-05-12 17:37 ` Simon Marchi
2020-05-13 1:59 ` Simon Marchi
2020-05-13 9:51 ` Michael Weghorn
2020-04-29 11:16 ` [PATCH 4/4] [PR gdbserver/25893]: Add gdbserver test for argument with space in it Michael Weghorn
2020-05-07 22:15 ` Simon Marchi
2020-05-10 15:59 ` [PATCH 1/2] gdb/testsuite: support passing inferior arguments with native-gdbserver board Simon Marchi
2020-05-10 15:59 ` [PATCH 2/2] gdb/testsuite: add inferior arguments test Simon Marchi
2020-05-15 20:07 ` Pedro Alves
2020-05-19 17:13 ` Simon Marchi
2020-05-20 16:28 ` Michael Weghorn
2020-05-15 20:07 ` [PATCH 1/2] gdb/testsuite: support passing inferior arguments with native-gdbserver board Pedro Alves
2020-05-10 16:09 ` [PATCH 4/4] [PR gdbserver/25893]: Add gdbserver test for argument with space in it Simon Marchi
2020-05-11 14:33 ` Michael Weghorn
2020-05-11 15:04 ` Simon Marchi
2020-05-12 16:20 ` Michael Weghorn
2020-05-12 16:50 ` Simon Marchi
2020-05-13 9:55 ` Michael Weghorn
2020-04-29 15:27 ` Patches for PR 25893 "gdbserver incorrectly handles program args containing space" Simon Marchi
2020-04-30 6:03 ` Michael Weghorn
2020-05-12 15:42 ` [PATCH v3 1/6] gdb: Move construct_inferior_arguments to gdbsupport Michael Weghorn
2020-05-12 15:42 ` [PATCH v3 2/6] gdbsupport: Adapt construct_inferior_arguments Michael Weghorn
2020-05-12 17:53 ` Simon Marchi
2020-05-13 9:56 ` Michael Weghorn
2020-05-12 15:42 ` [PATCH v3 3/6] gdbserver: Don't add extra NULL to program args Michael Weghorn
2020-05-12 15:42 ` [PATCH v3 4/6] nto_process_target::create_inferior: Pass args as char ** Michael Weghorn
2020-05-12 18:34 ` Simon Marchi
2020-05-13 9:56 ` Michael Weghorn
2020-05-12 15:42 ` [PATCH v3 5/6] [PR gdbserver/25893]: Use construct_inferior_arguments which handles special chars Michael Weghorn
2020-05-13 0:52 ` Simon Marchi
2020-05-13 0:54 ` Simon Marchi
2020-05-13 9:58 ` Michael Weghorn
2020-05-12 15:42 ` [PATCH v3 6/6] gdbsupport: Drop now unused function 'stringify_argv' Michael Weghorn
2020-05-13 0:52 ` Simon Marchi
2020-05-13 9:47 ` [PATCH v4 1/9] gdb: Move construct_inferior_arguments to gdbsupport Michael Weghorn
2020-05-13 9:47 ` [PATCH v4 2/9] gdbsupport: Adapt construct_inferior_arguments Michael Weghorn
2020-05-13 9:47 ` [PATCH v4 3/9] gdbsupport: Let construct_inferior_arguments take gdb::array_view param Michael Weghorn
2020-05-13 9:47 ` [PATCH v4 4/9] gdbserver: Don't add extra NULL to program args Michael Weghorn
2020-05-13 9:47 ` [PATCH v4 5/9] nto_process_target::create_inferior: Pass args as char ** Michael Weghorn
2020-05-13 9:47 ` [PATCH v4 6/9] [PR gdbserver/25893]: Use construct_inferior_arguments which handles special chars Michael Weghorn
2020-05-13 9:47 ` [PATCH v4 7/9] gdbsupport: Drop now unused function 'stringify_argv' Michael Weghorn
2020-05-13 9:47 ` [PATCH v4 8/9] gdb/testsuite: support passing inferior arguments with native-gdbserver board Michael Weghorn
2020-05-15 17:29 ` Tom de Vries
2020-05-19 17:11 ` Simon Marchi
2020-05-19 17:22 ` Simon Marchi
2020-05-19 18:46 ` Tom de Vries
2020-05-25 15:14 ` Simon Marchi
2020-05-13 9:47 ` [PATCH v4 9/9] gdb/testsuite: add inferior arguments test Michael Weghorn
2020-05-13 14:39 ` [PATCH v4 1/9] gdb: Move construct_inferior_arguments to gdbsupport Simon Marchi
2020-05-13 15:01 ` Michael Weghorn
2020-05-13 15:05 ` Simon Marchi
2020-05-20 16:37 ` Michael Weghorn
2020-05-20 16:40 ` Simon Marchi
2020-05-20 16:21 ` [PATCH v5 " Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 2/9] gdbsupport: Adapt construct_inferior_arguments Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 3/9] gdbsupport: Let construct_inferior_arguments take gdb::array_view param Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 4/9] gdbserver: Don't add extra NULL to program args Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 5/9] nto_process_target::create_inferior: Pass args as char ** Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 6/9] [PR gdbserver/25893]: Use construct_inferior_arguments which handles special chars Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 7/9] gdbsupport: Drop now unused function 'stringify_argv' Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 8/9] gdb/testsuite: support passing inferior arguments with native-gdbserver board Michael Weghorn
2020-05-20 16:21 ` [PATCH v5 9/9] gdb/testsuite: add inferior arguments test Michael Weghorn
2020-05-25 15:42 ` [PATCH v5 1/9] gdb: Move construct_inferior_arguments to gdbsupport Simon Marchi
2020-05-26 6:17 ` Michael Weghorn
2021-09-28 14:33 ` Simon Marchi
2021-09-29 5:53 ` Michael Weghorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ab6edbbb-b6ea-e2ba-6af9-672cd12df6f2@simark.ca \
--to=simark@simark.ca \
--cc=cbiesinger@google.com \
--cc=gdb-patches@sourceware.org \
--cc=m.weghorn@posteo.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).