contrib/buildsystems: handle quoted spaces in filenames

The engine.pl script expects file names not to contain spaces. However,
paths with spaces are quite prevalent on Windows. Use shellwords() rather
than split() to parse them correctly.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 11f0e16ddacb893e1e3a1cb7c25ece9bd664200e..ad6a82c30ce808b3ff62d77f61b75c33db8ef62b 100755 (executable)
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -12,6 +12,7 @@
 use File::Spec;
 use Cwd;
 use Generators;
 use File::Spec;
 use Cwd;
 use Generators;

+use Text::ParseWords;

 
 my (%build_structure, %compile_options, @makedry);
 my $out_dir = getcwd();
 
 my (%build_structure, %compile_options, @makedry);
 my $out_dir = getcwd();


@@ -231,7 +232,7 @@ sub removeDuplicates
 sub handleCompileLine
 {
     my ($line, $lineno) = @_;
 sub handleCompileLine
 {
     my ($line, $lineno) = @_;

-    my @parts = split(' ', $line);
+    my @parts = shellwords($line);

     my $sourcefile;
     shift(@parts); # ignore cmd
     while (my $part = shift @parts) {
     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 (@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);
     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 ($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/) {
     shift(@parts); # ignore cmd
     while ($part = shift @parts) {
         if ($part =~ /^-IGNORE/) {