From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32689 invoked by alias); 19 Apr 2014 20:23:40 -0000 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 Received: (qmail 32577 invoked by uid 89); 19 Apr 2014 20:23:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.7 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=unavailable version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx6-phx2.redhat.com Received: from mx6-phx2.redhat.com (HELO mx6-phx2.redhat.com) (209.132.183.39) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 19 Apr 2014 20:23:38 +0000 Received: from zmail14.collab.prod.int.phx2.redhat.com (zmail14.collab.prod.int.phx2.redhat.com [10.5.83.16]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3JKNY0x031222; Sat, 19 Apr 2014 16:23:34 -0400 Date: Sat, 19 Apr 2014 20:23:00 -0000 From: Kai Tietz To: Ray Donnelly Cc: gcc-patches@gcc.gnu.org, ktietz70@gmail.com, "binutils@sourceware.org Development" , gdb-patches@sourceware.org Message-ID: <1826621422.9537772.1397939013891.JavaMail.zimbra@redhat.com> In-Reply-To: <1397936424-2290-2-git-send-email-mingw.android@gmail.com> References: <1397936424-2290-1-git-send-email-mingw.android@gmail.com> <1397936424-2290-2-git-send-email-mingw.android@gmail.com> Subject: Re: [PATCH 1/2] Windows libibery: Don't quote args unnecessarily MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2014-04/txt/msg00391.txt.bz2 Hello Ray, Patches to libiberty need to be cross-posted to binutils, gdb, and gcc ML. I did so for you now. ----- Original Message ----- > We only quote arguments that contain spaces, \n \t \v > or " characters to prevent wasting 2 characters per > argument of the CreateProcess() 32,768 limit. > > libiberty/ > * pex-win32.c (argv_to_cmdline): Don't quote > args unnecessarily The changes to changelog shouldn't be part of the patch itself. Just write into mail the changelog entry patch needs to have. Eg as: Changelog libiberty/ * pex-win32.c (argv_to_cmdline): Don't quote args unnecessarily > --- > libiberty/ChangeLog | 5 +++++ > libiberty/pex-win32.c | 48 +++++++++++++++++++++++++++++++++++++++--------- > 2 files changed, 44 insertions(+), 9 deletions(-) > > diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog > index d9a208b..f6a4f8f 100644 > --- a/libiberty/ChangeLog > +++ b/libiberty/ChangeLog > @@ -1,3 +1,8 @@ > +2014-04-14 Ray Donnelly > + > + * pex-win32.c (argv_to_cmdline): Don't quote > + args unnecessarily. > + > 2014-04-17 Jakub Jelinek > > PR sanitizer/56781 > diff --git a/libiberty/pex-win32.c b/libiberty/pex-win32.c > index eae72c5..775b53c 100644 > --- a/libiberty/pex-win32.c > +++ b/libiberty/pex-win32.c > @@ -340,17 +340,26 @@ argv_to_cmdline (char *const *argv) > char *p; > size_t cmdline_len; > int i, j, k; > + int needs_quotes; > > cmdline_len = 0; > for (i = 0; argv[i]; i++) > { > - /* We quote every last argument. This simplifies the problem; > - we need only escape embedded double-quotes and immediately > + /* We only quote arguments that contain spaces, \n \t \v or " > characters > + to prevent wasting 2 chars per argument of the CreateProcess 32k char > + limit We need only escape embedded double-quotes and immediately > preceeding backslash characters. A sequence of backslach characters > that is not follwed by a double quote character will not be > escaped. */ > + needs_quotes = 0; > for (j = 0; argv[i][j]; j++) > { > + if (argv[i][j] == ' ' || argv[i][j] == '\n' || > + argv[i][j] == '\t' || argv[i][j] == '"' ) > + { Here seems to be an intend issue. > + needs_quotes = 1; > + } > + > if (argv[i][j] == '"') > { > /* Escape preceeding backslashes. */ > @@ -362,16 +371,34 @@ argv_to_cmdline (char *const *argv) > } > /* Trailing backslashes also need to be escaped because they will be > followed by the terminating quote. */ > - for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--) > - cmdline_len++; > + if (needs_quotes) > + { > + for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--) > + cmdline_len++; > + } > cmdline_len += j; > - cmdline_len += 3; /* for leading and trailing quotes and space */ > + /* for leading and trailing quotes and space */ > + cmdline_len += needs_quotes * 2 + 1; > } > cmdline = XNEWVEC (char, cmdline_len); > p = cmdline; > for (i = 0; argv[i]; i++) > { > - *p++ = '"'; > + needs_quotes = 0; > + for (j = 0; argv[i][j]; j++) > + { > + if (argv[i][j] == ' ' || argv[i][j] == '\n' || > + argv[i][j] == '\t' || argv[i][j] == '"' ) > + { > + needs_quotes = 1; > + break; > + } > + } > + > + if (needs_quotes) > + { > + *p++ = '"'; > + } > for (j = 0; argv[i][j]; j++) > { > if (argv[i][j] == '"') > @@ -382,9 +409,12 @@ argv_to_cmdline (char *const *argv) > } > *p++ = argv[i][j]; > } > - for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--) > - *p++ = '\\'; > - *p++ = '"'; > + if (needs_quotes) > + { > + for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--) > + *p++ = '\\'; > + *p++ = '"'; > + } > *p++ = ' '; > } > p[-1] = '\0'; > -- > 1.9.2 Patch itself makes sense. Let see if there are additional comments. Regards, Kai