Makefile: fix shell quoting

Makefile records paths to a few programs in GIT-BUILD-OPTIONS file.  These
paths need to be quoted twice: once to protect specials from the shell
that runs the generated GIT-BUILD-OPTIONS file, and again to protect them
(and the first level of quoting itself) from the shell that runs the
"echo" inside the Makefile.

You can test this by trying:

$ ln -s /bin/tar "$HOME/Tes' program/tar"
$ make TAR="$HOME/Tes' program/tar" test

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 1d142095a712f1b31ce6c27d730a12f6cb60b24f..f13184b2ba7dcd4dc7f6ab9eb0652550874d843a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1210,9 +1210,12 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
                echo "$$FLAGS" >GIT-CFLAGS; \
             fi
 
                echo "$$FLAGS" >GIT-CFLAGS; \
             fi
 

+# We need to apply sq twice, once to protect from the shell
+# that runs GIT-BUILD-OPTIONS, and then again to protect it
+# and the first level quoting from the shell that runs "echo".

 GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
 GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS

-       @echo SHELL_PATH=\''$(SHELL_PATH_SQ)'\' >$@
-       @echo TAR=\''$(subst ','\'',$(TAR))'\' >>$@
+       @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
+       @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@

 
 ### Detect Tck/Tk interpreter path changes
 ifndef NO_TCLTK
 
 ### Detect Tck/Tk interpreter path changes
 ifndef NO_TCLTK

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 5eb119ed0b137f60a2395da3a0531cd8114da3b9..87902f81ef5455290d8a5ff5cf91d39f5004b11b 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -67,7 +67,7 @@ test_expect_success \
 test_expect_success \
     'validate file modification time' \
     'mkdir extract &&
 test_expect_success \
     'validate file modification time' \
     'mkdir extract &&

-     $TAR xf b.tar -C extract a/a &&
+     "$TAR" xf b.tar -C extract a/a &&

      perl -e '\''print((stat("extract/a/a"))[9], "\n")'\'' >b.mtime &&
      echo "1117231200" >expected.mtime &&
      diff expected.mtime b.mtime'
      perl -e '\''print((stat("extract/a/a"))[9], "\n")'\'' >b.mtime &&
      echo "1117231200" >expected.mtime &&
      diff expected.mtime b.mtime'


@@ -79,7 +79,7 @@ test_expect_success \
 
 test_expect_success \
     'extract tar archive' \
 
 test_expect_success \
     'extract tar archive' \

-    '(cd b && $TAR xf -) <b.tar'
+    '(cd b && "$TAR" xf -) <b.tar'

 
 test_expect_success \
     'validate filenames' \
 
 test_expect_success \
     'validate filenames' \


@@ -96,7 +96,7 @@ test_expect_success \
 
 test_expect_success \
     'extract tar archive with prefix' \
 
 test_expect_success \
     'extract tar archive with prefix' \

-    '(cd c && $TAR xf -) <c.tar'
+    '(cd c && "$TAR" xf -) <c.tar'

 
 test_expect_success \
     'validate filenames with prefix' \
 
 test_expect_success \
     'validate filenames with prefix' \


@@ -116,7 +116,7 @@ test_expect_success \
 
 test_expect_success \
     'extract substfiles' \
 
 test_expect_success \
     'extract substfiles' \

-    '(mkdir f && cd f && $TAR xf -) <f.tar'
+    '(mkdir f && cd f && "$TAR" xf -) <f.tar'

 
 test_expect_success \
      'validate substfile contents' \
 
 test_expect_success \
      'validate substfile contents' \


@@ -128,7 +128,7 @@ test_expect_success \
 
 test_expect_success \
     'extract substfiles from archive with prefix' \
 
 test_expect_success \
     'extract substfiles from archive with prefix' \

-    '(mkdir g && cd g && $TAR xf -) <g.tar'
+    '(mkdir g && cd g && "$TAR" xf -) <g.tar'

 
 test_expect_success \
      'validate substfile contents from archive with prefix' \
 
 test_expect_success \
      'validate substfile contents from archive with prefix' \