From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by sourceware.org (Postfix) with ESMTPS id BD83E3851C0D for ; Wed, 13 May 2020 09:56:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BD83E3851C0D Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7E6AF2400FE for ; Wed, 13 May 2020 11:56:11 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49MVRk2HpJz9ryM; Wed, 13 May 2020 11:56:02 +0200 (CEST) Subject: Re: [PATCH v3 2/6] gdbsupport: Adapt construct_inferior_arguments To: Simon Marchi , gdb-patches@sourceware.org References: <20200429111638.1327262-1-m.weghorn@posteo.de> <20200512154211.1311364-1-m.weghorn@posteo.de> <20200512154211.1311364-2-m.weghorn@posteo.de> From: Michael Weghorn Message-ID: <34edaba1-5c55-3ec9-7119-304c8fe48d2b@posteo.de> Date: Wed, 13 May 2020 11:56:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, 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, 13 May 2020 09:56:14 -0000 On 12/05/2020 19.53, Simon Marchi wrote: > 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? Yes, done in v4. > >> - 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. Done in v4. > >> >> 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? Yes done in v4. Michael