From: Simon Marchi <simark@simark.ca>
To: Michael Weghorn <m.weghorn@posteo.de>, gdb-patches@sourceware.org
Subject: Re: [PATCH v3 2/6] gdbsupport: Adapt construct_inferior_arguments
Date: Tue, 12 May 2020 13:53:44 -0400 [thread overview]
Message-ID: <bf9bff15-df73-726c-c65d-5eebf3b39977@simark.ca> (raw)
In-Reply-To: <20200512154211.1311364-2-m.weghorn@posteo.de>
Just some nits.
On 2020-05-12 11:42 a.m., Michael Weghorn via Gdb-patches wrote:
> diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc
> index a7d631f357..cadbd50e9c 100644
> --- a/gdbsupport/common-inferior.cc
> +++ b/gdbsupport/common-inferior.cc
> @@ -27,15 +27,12 @@ bool startup_with_shell = true;
>
> /* See common-inferior.h. */
>
> -char *
> -construct_inferior_arguments (int argc, char **argv)
> +std::string
> +construct_inferior_arguments (int argc, char * const *argv)
> {
> - char *result;
> + gdb_assert (argc >= 0);
>
> - /* 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);
> + std::string result;
>
> if (startup_with_shell)
> {
> @@ -52,48 +49,39 @@ construct_inferior_arguments (int argc, char **argv)
> static const char quote = '\'';
> #endif
> int i;
Can you inline this in the for loop while at it?
> - int length = 0;
> - char *out, *cp;
> -
> - /* We over-compute the size. It shouldn't matter. */
> - for (i = 0; i < argc; ++i)
> - length += 3 * strlen (argv[i]) + 1 + 2 * (argv[i][0] == '\0');
> -
> - result = (char *) xmalloc (length);
> - out = result;
>
> for (i = 0; i < argc; ++i)
> {
> if (i > 0)
> - *out++ = ' ';
> + result += ' ';
>
> /* Need to handle empty arguments specially. */
> if (argv[i][0] == '\0')
> {
> - *out++ = quote;
> - *out++ = quote;
> + result += quote;
> + result += quote;
> }
> else
> {
> #ifdef __MINGW32__
> - int quoted = 0;
> + bool quoted = 0;
Replace 0 with false.
>
> if (strpbrk (argv[i], special))
> {
> - quoted = 1;
> - *out++ = quote;
> + quoted = true;
> + result += quote;
> }
> #endif
> - for (cp = argv[i]; *cp; ++cp)
> + for (char *cp = argv[i]; *cp; ++cp)
> {
> if (*cp == '\n')
> {
> /* A newline cannot be quoted with a backslash (it
> just disappears), only by putting it inside
> quotes. */
> - *out++ = quote;
> - *out++ = '\n';
> - *out++ = quote;
> + result += quote;
> + result += '\n';
> + result += quote;
> }
> else
> {
> @@ -102,24 +90,22 @@ construct_inferior_arguments (int argc, char **argv)
> #else
> if (strchr (special, *cp) != NULL)
> #endif
> - *out++ = '\\';
> - *out++ = *cp;
> + result += '\\';
> + result += *cp;
> }
> }
> #ifdef __MINGW32__
> if (quoted)
> - *out++ = quote;
> + result += quote;
> #endif
> }
> }
> - *out = '\0';
> }
> else
> {
> /* In this case we can't handle arguments that contain spaces,
> tabs, or newlines -- see breakup_args(). */
> int i;
Can you also inline this one in the for loops?
Simon
next prev parent reply other threads:[~2020-05-12 17:53 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
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 [this message]
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=bf9bff15-df73-726c-c65d-5eebf3b39977@simark.ca \
--to=simark@simark.ca \
--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).