From 0bb361f27252ad8308f8e208af76536821ce29ce Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 25 Apr 2009 15:32:33 +0200 Subject: [PATCH] vc-list-files: fix another quoting bug * build-aux/vc-list-files: Avoid sed backslash expansion of pathological directory names. --- ChangeLog | 6 ++++++ build-aux/vc-list-files | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 689b3724a..27de4470d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-25 Jim Meyering + + vc-list-files: fix another quoting bug + * build-aux/vc-list-files: Avoid sed backslash expansion + of pathological directory names. + 2009-04-25 Eric Blake vc-list-files: fix shell quoting error diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index 08dc8ab2f..9376e3dc2 100755 --- a/build-aux/vc-list-files +++ b/build-aux/vc-list-files @@ -72,13 +72,15 @@ esac test "x$dir" = x && dir=. if test -d .git; then - test "x$dir" = x. && dir= || dir="$dir/" + test "x$dir" = x. \ + && dir= sed_esc= \ + || dir="$dir/" sed_esc=`echo "$dir"|sed 's,\([\\/]\),\\\\\1,g'` # Ignore git symlinks - either they point into the tree, in which case # we don't need to visit the target twice, or they point somewhere # else (often into a submodule), in which case the content does not # belong to this package. eval exec git ls-tree -r 'HEAD:"$dir"' \ - \| sed -n '"s!^100[^ ]*.!$dir!p"' $postprocess + \| sed -n '"s/^100[^ ]*./$sed_esc/p"' $postprocess elif test -d .hg; then eval exec hg locate '"$dir/*"' $postprocess elif test -d .bzr; then -- 2.11.0