From: Philip Oakley <philipoakley@iee.org>
To: GitList <git@vger.kernel.org>
Cc: Marius Storm-Olsen <mstormo@gmail.com>,
Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
Jonathan Nieder <jrnieder@gmail.com>,
Michael Wookey <michaelwookey@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Msysgit <msysgit@googlegroups.com>
Subject: [RFC 2/4] Properly accept quoted space in filenames
Date: Thu, 20 Nov 2014 23:38:00 +0000 [thread overview]
Message-ID: <1416526682-6024-3-git-send-email-philipoakley@iee.org> (raw)
In-Reply-To: <1416526682-6024-1-git-send-email-philipoakley@iee.org>
the engine.pl script barfs on the properly quoted space
in filename options prevalent on Windows. Use quotewords()
rather than split() to separate such options.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
contrib/buildsystems/engine.pl | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 9144ea7..8e41808 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();
@@ -243,7 +244,8 @@ sub removeDuplicates
sub handleCompileLine
{
my ($line, $lineno) = @_;
- my @parts = split(' ', $line);
+ # my @parts = split(' ', $line);
+ my @parts = quotewords('\s+', 0, $line);
my $sourcefile;
shift(@parts); # ignore cmd
while (my $part = shift @parts) {
@@ -277,7 +279,8 @@ sub handleLibLine
my (@objfiles, @lflags, $libout, $part);
# kill cmd and rm 'prefix'
$line =~ s/^rm -f .* && .* rcs //;
- my @parts = split(' ', $line);
+ # my @parts = split(' ', $line);
+ my @parts = quotewords('\s+', 0, $line);
while ($part = shift @parts) {
if ($part =~ /^-/) {
push(@lflags, $part);
@@ -318,7 +321,9 @@ sub handleLinkLine
{
my ($line, $lineno) = @_;
my (@objfiles, @lflags, @libs, $appout, $part);
- my @parts = split(' ', $line);
+ # my @parts = split(' ', $line);
+ my @parts = quotewords('\s+', 0, $line);
+
shift(@parts); # ignore cmd
while ($part = shift @parts) {
if ($part =~ /^-IGNORE/) {
--
1.9.4.msysgit.0
--
--
*** 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.
next prev parent reply other threads:[~2014-11-20 23:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-20 23:37 [RFC 0/4] Fix the Visual Studio 2008 .sln generator Philip Oakley
2014-11-20 23:37 ` [RFC 1/4] Fix i18n -o option in msvc engine.pl Philip Oakley
2014-11-21 9:41 ` Johannes Schindelin
2014-11-21 20:27 ` Philip Oakley
2014-11-20 23:38 ` Philip Oakley [this message]
2014-11-21 9:42 ` [RFC 2/4] Properly accept quoted space in filenames Johannes Schindelin
2014-11-21 22:34 ` Junio C Hamano
2014-11-21 23:11 ` Philip Oakley
2014-11-21 23:21 ` Junio C Hamano
2014-11-20 23:38 ` [RFC 3/4] engine.pl: split the .o and .obj processing Philip Oakley
2014-11-21 9:48 ` Johannes Schindelin
2014-11-21 20:35 ` Philip Oakley
2014-11-23 15:28 ` Johannes Schindelin
2014-11-23 22:50 ` Philip Oakley
2014-11-20 23:38 ` [RFC 4/4] Improve layout and reference msvc-build script Philip Oakley
2014-11-21 9:51 ` Johannes Schindelin
2014-11-21 21:05 ` Philip Oakley
2014-11-21 9:38 ` [RFC 0/4] Fix the Visual Studio 2008 .sln generator Johannes Schindelin
2014-11-21 20:22 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416526682-6024-3-git-send-email-philipoakley@iee.org \
--to=philipoakley@iee.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=michaelwookey@gmail.com \
--cc=mstormo@gmail.com \
--cc=msysgit@googlegroups.com \
--cc=ramsay@ramsay1.demon.co.uk \
/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.
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 NNTP newsgroup(s).