From patchwork Mon Mar 4 08:10:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Ye X-Patchwork-Id: 224634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 2B20C2C02FF for ; Mon, 4 Mar 2013 19:11:43 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1362989505; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: From:To:Cc:References:In-Reply-To:Subject:Date:Message-ID: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=X36MKzqJWvheNvdSnysq7Ca1eHc=; b=HJ+fKvUhXj8Aetc x8A10skopnhssoEzp2Ojz0GaFX5qp1UaQOPVlCMX9z6p1CU2guxDnDTrEcDxZokT CDtxwL3hDrDo/rMNpHn1hvUHl01olHBiYvZMRCgkr6e8pRk/4eISe4A31srHWQN/ 6yC/nerqyqLbGa8boz2t82Nagnbs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:From:To:Cc:References:In-Reply-To:Subject:Date:Message-ID:MIME-Version:X-MC-Unique:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Udd+nleQeixLpojlkzqhgufEY/r8xMi6otFuHmXGqUPV4YwLNuYn2VQhLRpygn dIIoPL6/atEw9LaU/oFe5m93aRxQjsQk3n9GqOdZlI5dJdlmu23hvt80ef5jOkUg LM7EjRoYg3IDhSrYDp1Y26kqj5ArFes8wVBrpVh7RisAs=; Received: (qmail 11017 invoked by alias); 4 Mar 2013 08:11:30 -0000 Received: (qmail 11007 invoked by uid 22791); 4 Mar 2013 08:11:28 -0000 X-SWARE-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL, BAYES_50, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, KHOP_THREADED, MSGID_MULTIPLE_AT, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 04 Mar 2013 08:11:21 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Mon, 04 Mar 2013 08:11:19 +0000 Received: from E103005 ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Mon, 4 Mar 2013 08:11:16 +0000 From: "Joey Ye" To: "'Joseph Myers'" Cc: References: <000001ce0cb4$6b491000$41db3000$@ye@arm.com> <000101ce0d88$7febdb80$7fc39280$@ye@arm.com> In-Reply-To: Subject: RE: [PATCH] Fix PR50293 - LTO plugin with space in path Date: Mon, 4 Mar 2013 16:10:48 +0800 Message-ID: <000101ce18af$c9e89750$5db9c5f0$@ye@arm.com> MIME-Version: 1.0 X-MC-Unique: 113030408111903201 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org > -----Original Message----- > From: Joseph Myers [mailto:joseph@codesourcery.com] > Sent: Monday, March 04, 2013 00:49 > To: Joey Ye > Cc: gcc-patches@gcc.gnu.org > Subject: RE: [PATCH] Fix PR50293 - LTO plugin with space in path > > On Mon, 18 Feb 2013, Joey Ye wrote: > > > +static char * convert_white_space (char *); > > No space after "*". Fixed > > > - linker_plugin_file_spec = find_a_file (&exec_prefixes, > > + char * temp_spec = find_a_file (&exec_prefixes, > > LTOPLUGINSONAME, R_OK, > > false); > > The indentation of the following lines looks odd after this patch; > unless > that's just an effect of TABs plus quoting, make sure they are > reindented > to line up with the new position of the opening '('. They was unchanged. But since the line with '(' changed, it need changing too. Fixed > > > +/* Insert back slash before spaces in orig (usually a file path), to > > Capitalize variable names when referring to the value of the variable, > so > ORIG; likewise elsewhere in this comment. Single work "backslash". > > > + the filename should be treated as a single argument rather than > being > > "file name" should be two words, according to the GNU Coding Standards. > > > + This function converts and only converts all occurrance of ' ' > > "occurrence" > > > + Return: orig if no conversion needed. orig if conversion needed > but no > > + sufficient memory for a new string. Otherwise a newly allocated > string > > Returning wrong results on insufficient memory doesn't make sense. > Anyway, xmalloc always exits the program if there is insufficient memory, > so you don't need any code to allow for that case. Fixed. Though it is conflicting with secure coding practice. > > > +static char * convert_white_space (char *orig) > > Newline, not space, between return type and function name, so that the > function name comes at the start of the line. Fixed. > > > + if (orig == NULL) return orig; > > The comment didn't mention NULL as a valid argument, and it doesn't > appear > NULL can actually be passed to this function. So don't include code to > handle that case. Fixed. > > > + for (len=0; orig[len]; len++) > > Spaces around "=". Fixed. > > > + if (orig[len] == ' ' || orig[len] == '\t') number_of_space ++; > > No space before "++", but put the body of the "if" on a separate line. Fixed. > > > + char * new_spec = (char *)xmalloc (len + number_of_space + 1); > > No space after "*". Space in the cast after "(char *)". Fixed. > > > + int j,k; > > Space after ",". Fixed. > > > + if (new_spec == NULL) return orig; > > As discussed above, not needed. Removed. > > > + for (j=0, k=0; j<=len; j++, k++) > > Spaces around "=" and "<=". Fixed. > > > + if (orig[j] == ' ' || orig[j] == '\t') new_spec[k++] = '\\'; > > Put the "if" both on a separate line. Fixed. > > > + else return orig; > > Put the "else" body on a separate line. Fixed. > > -- > Joseph S. Myers > joseph@codesourcery.com /* The Specs Language @@ -6595,6 +6596,7 @@ X_OK, false); if (lto_wrapper_file) { + lto_wrapper_file = convert_white_space (lto_wrapper_file); lto_wrapper_spec = lto_wrapper_file; obstack_init (&collect_obstack); obstack_grow (&collect_obstack, "COLLECT_LTO_WRAPPER=", @@ -7005,12 +7007,13 @@ + strlen (fuse_linker_plugin), 0)) #endif { - linker_plugin_file_spec = find_a_file (&exec_prefixes, - LTOPLUGINSONAME, R_OK, - false); - if (!linker_plugin_file_spec) + char *temp_spec = find_a_file (&exec_prefixes, + LTOPLUGINSONAME, R_OK, + false); + if (!temp_spec) fatal_error ("-fuse-linker-plugin, but %s not found", LTOPLUGINSONAME); + linker_plugin_file_spec = convert_white_space (temp_spec); } #endif lto_gcc_spec = argv[0]; @@ -8506,3 +8509,51 @@ free (name); return result; } + +/* Insert backslash before spaces in ORIG (usually a file path), to + avoid being broken by spec parser. + + This function is needed as do_spec_1 treats white space (' ' and '\t') + as the end of an argument. But in case of -plugin /usr/gcc install/xxx.so, + the file name should be treated as a single argument rather than being + broken into multiple. Solution is to insert '\\' before the space in a + file name. + + This function converts and only converts all occurrence of ' ' + to '\\' + ' ' and '\t' to '\\' + '\t'. For example: + "a b" -> "a\\ b" + "a b" -> "a\\ \\ b" + "a\tb" -> "a\\\tb" + "a\\ b" -> "a\\\\ b" + + orig: input null-terminating string that was allocated by xalloc. The + memory it points to might be freed in this function. Behavior undefined + if ORIG wasn't xalloced or was freed already at entry. + + Return: ORIG if no conversion needed. Otherwise a newly allocated string + that was converted from ORIG. */ + +static char * +convert_white_space (char *orig) +{ + int len, number_of_space = 0; + + for (len = 0; orig[len]; len++) + if (orig[len] == ' ' || orig[len] == '\t') number_of_space++; + + if (number_of_space) + { + char *new_spec = (char *)xmalloc (len + number_of_space + 1); + int j, k; + for (j = 0, k = 0; j <= len; j++, k++) + { + if (orig[j] == ' ' || orig[j] == '\t') + new_spec[k++] = '\\'; + new_spec[k] = orig[j]; + } + free (orig); + return new_spec; + } + else + return orig; +} Index: gcc/gcc.c =================================================================== --- gcc/gcc.c (revision 195189) +++ gcc/gcc.c (working copy) @@ -265,6 +265,7 @@ static const char *compare_debug_auxbase_opt_spec_function (int, const char **); static const char *pass_through_libs_spec_func (int, const char **); static const char *replace_extension_spec_func (int, const char **); +static char *convert_white_space (char *); /* The Specs Language @@ -6595,6 +6596,7 @@ X_OK, false); if (lto_wrapper_file) { + lto_wrapper_file = convert_white_space (lto_wrapper_file); lto_wrapper_spec = lto_wrapper_file; obstack_init (&collect_obstack); obstack_grow (&collect_obstack, "COLLECT_LTO_WRAPPER=", @@ -7005,12 +7007,13 @@ + strlen (fuse_linker_plugin), 0)) #endif { - linker_plugin_file_spec = find_a_file (&exec_prefixes, - LTOPLUGINSONAME, R_OK, - false); - if (!linker_plugin_file_spec) + char *temp_spec = find_a_file (&exec_prefixes, + LTOPLUGINSONAME, R_OK, + false); + if (!temp_spec) fatal_error ("-fuse-linker-plugin, but %s not found", LTOPLUGINSONAME); + linker_plugin_file_spec = convert_white_space (temp_spec); } #endif lto_gcc_spec = argv[0]; @@ -8506,3 +8509,51 @@ free (name); return result; } + +/* Insert backslash before spaces in ORIG (usually a file path), to + avoid being broken by spec parser. + + This function is needed as do_spec_1 treats white space (' ' and '\t') + as the end of an argument. But in case of -plugin /usr/gcc install/xxx.so, + the file name should be treated as a single argument rather than being + broken into multiple. Solution is to insert '\\' before the space in a + file name. + + This function converts and only converts all occurrence of ' ' + to '\\' + ' ' and '\t' to '\\' + '\t'. For example: + "a b" -> "a\\ b" + "a b" -> "a\\ \\ b" + "a\tb" -> "a\\\tb" + "a\\ b" -> "a\\\\ b" + + orig: input null-terminating string that was allocated by xalloc. The + memory it points to might be freed in this function. Behavior undefined + if ORIG wasn't xalloced or was freed already at entry. + + Return: ORIG if no conversion needed. Otherwise a newly allocated string + that was converted from ORIG. */ + +static char * +convert_white_space (char *orig) +{ + int len, number_of_space = 0; + + for (len = 0; orig[len]; len++) + if (orig[len] == ' ' || orig[len] == '\t') number_of_space++; + + if (number_of_space) + { + char *new_spec = (char *)xmalloc (len + number_of_space + 1); + int j, k; + for (j = 0, k = 0; j <= len; j++, k++) + { + if (orig[j] == ' ' || orig[j] == '\t') + new_spec[k++] = '\\'; + new_spec[k] = orig[j]; + } + free (orig); + return new_spec; + } + else + return orig; +} Index: gcc/gcc.c =================================================================== --- gcc/gcc.c (revision 195189) +++ gcc/gcc.c (working copy) @@ -265,6 +265,7 @@ static const char *compare_debug_auxbase_opt_spec_function (int, const char **); static const char *pass_through_libs_spec_func (int, const char **); static const char *replace_extension_spec_func (int, const char **); +static char *convert_white_space (char *);