git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Philip Oakley <philipoakley@iee.org>
To: GitList <git@vger.kernel.org>
Cc: MsysGitList <msysgit@googlegroups.com>,
	Philip Oakley <philipoakley@iee.org>
Subject: [PATCH 07/17] engine.pl: Properly accept quoted spaces in filenames
Date: Thu, 25 Jun 2015 01:03:43 +0100	[thread overview]
Message-ID: <1435190633-2208-8-git-send-email-philipoakley@iee.org> (raw)
In-Reply-To: <1435190633-2208-1-git-send-email-philipoakley@iee.org>

The engine.pl script barfs on the properly quoted spaces in
filename options prevalent on Windows. Use shellwords() rather
than split() to separate such options.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
$gamane/21145 & $gmane/21147
---
 contrib/buildsystems/engine.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 4d0a616..ccb59fd 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -12,6 +12,7 @@ use File::Basename;
 use File::Spec;
 use Cwd;
 use Generators;
+use Text::ParseWords;
 
 my (%build_structure, %compile_options, @makedry);
 my $out_dir = getcwd();
@@ -231,7 +232,7 @@ sub removeDuplicates
 sub handleCompileLine
 {
     my ($line, $lineno) = @_;
-    my @parts = split(' ', $line);
+    my @parts = shellwords($line);
     my $sourcefile;
     shift(@parts); # ignore cmd
     while (my $part = shift @parts) {
@@ -265,7 +266,7 @@ sub handleLibLine
     my (@objfiles, @lflags, $libout, $part);
     # kill cmd and rm 'prefix'
     $line =~ s/^rm -f .* && .* rcs //;
-    my @parts = split(' ', $line);
+    my @parts = shellwords($line);
     while ($part = shift @parts) {
         if ($part =~ /^-/) {
             push(@lflags, $part);
@@ -306,7 +307,7 @@ sub handleLinkLine
 {
     my ($line, $lineno) = @_;
     my (@objfiles, @lflags, @libs, $appout, $part);
-    my @parts = split(' ', $line);
+    my @parts = shellwords($line);
     shift(@parts); # ignore cmd
     while ($part = shift @parts) {
         if ($part =~ /^-IGNORE/) {
-- 
2.3.1

-- 
-- 
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en

--- 
You received this message because you are subscribed to the Google Groups "Git for Windows" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

  parent reply	other threads:[~2015-06-25  0:02 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-25  0:03 [PATCH 00/17] Make the msvc-build scripts work again Philip Oakley
2015-06-25  0:03 ` [PATCH 01/17] .gitignore: improve MSVC ignore patterns Philip Oakley
2015-06-25 15:13   ` Junio C Hamano
2015-06-25 19:32     ` Philip Oakley
2015-06-25 20:22       ` Junio C Hamano
2015-06-25  0:03 ` [PATCH 02/17] .gitignore: ignore library directories created by MSVC VS2008 buildsystem Philip Oakley
2015-06-25  0:03 ` [PATCH 03/17] (msvc-build) Vcproj.pm: remove duplicate GUID Philip Oakley
2015-06-28  3:05   ` Eric Sunshine
2015-06-28  8:44     ` Philip Oakley
2015-06-25  0:03 ` [PATCH 04/17] Makefile: a dry-run can error out if no perl. Document the issue Philip Oakley
2015-06-25 15:24   ` Junio C Hamano
2015-06-25 19:33     ` Philip Oakley
2015-06-25 20:21       ` Junio C Hamano
2015-06-25 23:34         ` Philip Oakley
2015-07-14 22:42           ` Philip Oakley
2015-06-25  0:03 ` [PATCH 05/17] engine.pl: fix error message (lib->link) Philip Oakley
2015-06-25  0:03 ` [PATCH 06/17] engine.pl: Avoid complications with perl support Philip Oakley
2015-06-25  0:03 ` Philip Oakley [this message]
2015-06-25  0:03 ` [PATCH 08/17] engine.pl: Fix i18n -o option in msvc buildsystem generator Philip Oakley
2015-06-25  0:03 ` [PATCH 09/17] engine.pl: ignore invalidcontinue.obj which is known to MSVC Philip Oakley
2015-06-25  0:03 ` [PATCH 10/17] engine.pl: name the msvc buildsystem's makedry error file Philip Oakley
2015-06-25  0:03 ` [PATCH 11/17] engine.pl: delete the captured stderr file if empty Philip Oakley
2015-06-25  0:03 ` [PATCH 12/17] engine.pl: add debug line to capture the dry-run Philip Oakley
2015-06-25  0:03 ` [PATCH 13/17] engine.pl: provide more debug print statements Philip Oakley
2015-06-29 21:27   ` Sebastian Schuberth
2015-07-07 22:18     ` Philip Oakley
2015-06-29 21:31   ` Sebastian Schuberth
2015-06-29 21:33   ` Sebastian Schuberth
2015-06-25  0:03 ` [PATCH 14/17] Vcproj.pm: list git.exe first to be startup project Philip Oakley
2015-06-25  0:03 ` [PATCH 15/17] vcbuild/readme: Improve layout and reference msvc-build script Philip Oakley
2015-06-25  0:03 ` [PATCH 16/17] msvc-build: add complete Microsoft Visual C compilation script Philip Oakley
2015-06-25  0:03 ` [PATCH 17/17] config.mak.uname: add MSVC No_SafeExeceptionHandler option Philip Oakley
2015-06-25 15:10 ` [PATCH 00/17] Make the msvc-build scripts work again Junio C Hamano
2015-06-25 19:31   ` Philip Oakley

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435190633-2208-8-git-send-email-philipoakley@iee.org \
    --to=philipoakley@iee.org \
    --cc=git@vger.kernel.org \
    --cc=msysgit@googlegroups.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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).