From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by sourceware.org (Postfix) with ESMTPS id F0D67385DC32 for ; Wed, 20 May 2020 16:21:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F0D67385DC32 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5C0A0160061 for ; Wed, 20 May 2020 18:21:34 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49RygK4vZBz6tmZ; Wed, 20 May 2020 18:21:33 +0200 (CEST) From: Michael Weghorn To: gdb-patches@sourceware.org Cc: Michael Weghorn Subject: [PATCH v5 2/9] gdbsupport: Adapt construct_inferior_arguments Date: Wed, 20 May 2020 18:21:08 +0200 Message-Id: <20200520162115.713005-2-m.weghorn@posteo.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200520162115.713005-1-m.weghorn@posteo.de> References: <20200429111638.1327262-1-m.weghorn@posteo.de> <20200520162115.713005-1-m.weghorn@posteo.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2020 16:21:37 -0000 Allow construct_inferior_arguments to handle zero args and have it return a std::string, similar to how stringify_argv in gdbsupport/common-utils does. Also, add a const qualifier for the second parameter, since it is only read, not written to. The intention is to replace existing uses of stringify_argv by construct_inferior_arguments in a subsequent step, since construct_inferior_arguments properly handles special characters, while stringify_argv doesn't. 2020-05-13 Michael Weghorn * common-inferior.cc, common-inferior.h (construct_inferior_arguments): Adapt to handle zero args and return a std::string. Adapt call site. --- gdb/infcmd.c | 9 ++--- gdbsupport/common-inferior.cc | 65 ++++++++++++----------------------- gdbsupport/common-inferior.h | 2 +- 3 files changed, 26 insertions(+), 50 deletions(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index cf6e540e79..ffcc364f64 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, - current_inferior ()->argv); - set_inferior_args (n); - xfree (n); + std::string n = construct_inferior_arguments (current_inferior ()->argc, + current_inferior ()->argv); + set_inferior_args (n.c_str ()); } if (current_inferior ()->args == NULL) diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc index a7d631f357..aa8be14c74 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) { @@ -51,49 +48,38 @@ construct_inferior_arguments (int argc, char **argv) static const char special[] = "\"!#$&*()\\|[]{}<>?'`~^; \t\n"; static const char quote = '\''; #endif - int i; - 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) + for (int 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 = 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,26 +88,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; - int length = 0; - - for (i = 0; i < argc; ++i) + for (int i = 0; i < argc; ++i) { char *cp = strchr (argv[i], ' '); if (cp == NULL) @@ -131,16 +113,13 @@ construct_inferior_arguments (int argc, char **argv) if (cp != NULL) error (_("can't handle command-line " "argument containing whitespace")); - length += strlen (argv[i]) + 1; } - result = (char *) xmalloc (length); - result[0] = '\0'; - for (i = 0; i < argc; ++i) + for (int i = 0; i < argc; ++i) { if (i > 0) - strcat (result, " "); - strcat (result, argv[i]); + result += " "; + result += argv[i]; } } diff --git a/gdbsupport/common-inferior.h b/gdbsupport/common-inferior.h index ee87bc75a3..5e9fc8b0b9 100644 --- a/gdbsupport/common-inferior.h +++ b/gdbsupport/common-inferior.h @@ -60,6 +60,6 @@ extern bool startup_with_shell; /* Compute command-line string given argument vector. This does the same shell processing as fork_inferior. */ -extern char *construct_inferior_arguments (int, char **); +extern std::string construct_inferior_arguments (int, char * const *); #endif /* COMMON_COMMON_INFERIOR_H */ -- 2.26.2