Shell utilities: Guard against expr' magic tokens.
Some words, e.g., `match', are special to expr(1), and cause strange parsing effects. Track down all uses of expr and mangle the arguments so that this isn't a problem. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Mark Wooding committed
Apr 13, 2006 at 22:01 UTC
f327dbced25a3c6fcc0b84d2d6adffa9343b09f0
9 files changed
+30
-30
git-cherry.sh
+1
-1
@@ -20,7 +20,7 @@ case "$1" in -v) verbose=t; shift ;; esac
20
21
case "$#,$1" in
22
1,*..*)
23
- upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
23
+ upstream=$(expr "z$1" : 'z\(.*\)\.\.') ours=$(expr "z$1" : '.*\.\.\(.*\)$')
24
set x "$upstream" "$ours"
25
shift ;;
26
esac
git-clone.sh
+3
-3
@@ -38,12 +38,12 @@ Perhaps git-update-server-info needs to be run there?"
38
}
39
while read sha1 refname
40
do
41
- name=`expr "$refname" : 'refs/\(.*\)'` &&
41
+ name=`expr "z$refname" : 'zrefs/\(.*\)'` &&
42
case "$name" in
43
*^*) continue;;
44
esac
45
if test -n "$use_separate_remote" &&
46
- branch_name=`expr "$name" : 'heads/\(.*\)'`
46
+ branch_name=`expr "z$name" : 'zheads/\(.*\)'`
47
then
48
tname="remotes/$origin/$branch_name"
49
else
@@ -346,7 +346,7 @@ then
346
# new style repository with a symref HEAD).
347
# Ideally we should skip the guesswork but for now
348
# opt for minimum change.
349
- head_sha1=`expr "$head_sha1" : 'ref: refs/heads/\(.*\)'`
349
+ head_sha1=`expr "z$head_sha1" : 'zref: refs/heads/\(.*\)'`
350
head_sha1=`cat "$GIT_DIR/$remote_top/$head_sha1"`
351
;;
352
esac
git-commit.sh
+2
-2
@@ -549,8 +549,8 @@ fi >>"$GIT_DIR"/COMMIT_EDITMSG
549
# Author
550
if test '' != "$force_author"
551
then
552
- GIT_AUTHOR_NAME=`expr "$force_author" : '\(.*[^ ]\) *<.*'` &&
553
- GIT_AUTHOR_EMAIL=`expr "$force_author" : '.*\(<.*\)'` &&
552
+ GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
553
+ GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
554
test '' != "$GIT_AUTHOR_NAME" &&
555
test '' != "$GIT_AUTHOR_EMAIL" ||
556
die "malformatted --author parameter"
git-fetch.sh
+9
-9
@@ -112,7 +112,7 @@ append_fetch_head () {
112
*)
113
note_="$remote_name of " ;;
114
esac
115
- remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
115
+ remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') &&
116
remote_="$remote_1_"
117
note_="$note_$remote_"
118
@@ -245,22 +245,22 @@ fetch_main () {
245
246
# These are relative path from $GIT_DIR, typically starting at refs/
247
# but may be HEAD
248
- if expr "$ref" : '\.' >/dev/null
248
+ if expr "z$ref" : 'z\.' >/dev/null
249
then
250
not_for_merge=t
251
- ref=$(expr "$ref" : '\.\(.*\)')
251
+ ref=$(expr "z$ref" : 'z\.\(.*\)')
252
else
253
not_for_merge=
254
fi
255
- if expr "$ref" : '\+' >/dev/null
255
+ if expr "z$ref" : 'z\+' >/dev/null
256
then
257
single_force=t
258
- ref=$(expr "$ref" : '\+\(.*\)')
258
+ ref=$(expr "z$ref" : 'z\+\(.*\)')
259
else
260
single_force=
261
fi
262
- remote_name=$(expr "$ref" : '\([^:]*\):')
263
- local_name=$(expr "$ref" : '[^:]*:\(.*\)')
262
+ remote_name=$(expr "z$ref" : 'z\([^:]*\):')
263
+ local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)')
264
265
rref="$rref$LF$remote_name"
266
@@ -276,7 +276,7 @@ fetch_main () {
276
print "$u";
277
' "$remote_name")
278
head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") &&
279
- expr "$head" : "$_x40\$" >/dev/null ||
279
+ expr "z$head" : "z$_x40\$" >/dev/null ||
280
die "Failed to fetch $remote_name from $remote"
281
echo >&2 Fetching "$remote_name from $remote" using http
282
git-http-fetch -v -a "$head" "$remote/" || exit
@@ -362,7 +362,7 @@ fetch_main () {
362
break ;;
363
esac
364
done
365
- local_name=$(expr "$found" : '[^:]*:\(.*\)')
365
+ local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
366
append_fetch_head "$sha1" "$remote" \
367
"$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
368
done
git-format-patch.sh
+2
-2
@@ -126,8 +126,8 @@ for revpair
126
do
127
case "$revpair" in
128
?*..?*)
129
- rev1=`expr "$revpair" : '\(.*\)\.\.'`
130
- rev2=`expr "$revpair" : '.*\.\.\(.*\)'`
129
+ rev1=`expr "z$revpair" : 'z\(.*\)\.\.'`
130
+ rev2=`expr "z$revpair" : 'z.*\.\.\(.*\)'`
131
;;
132
*)
133
rev1="$revpair^"
git-merge-one-file.sh
+1
-1
@@ -26,7 +26,7 @@ case "${1:-.}${2:-.}${3:-.}" in
26
fi
27
if test -f "$4"; then
28
rm -f -- "$4" &&
29
- rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null || :
29
+ rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
30
fi &&
31
exec git-update-index --remove -- "$4"
32
;;
git-parse-remote.sh
+10
-10
@@ -8,8 +8,8 @@ get_data_source () {
8
case "$1" in
9
*/*)
10
# Not so fast. This could be the partial URL shorthand...
11
- token=$(expr "$1" : '\([^/]*\)/')
12
- remainder=$(expr "$1" : '[^/]*/\(.*\)')
11
+ token=$(expr "z$1" : 'z\([^/]*\)/')
12
+ remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
13
if test -f "$GIT_DIR/branches/$token"
14
then
15
echo branches-partial
@@ -43,8 +43,8 @@ get_remote_url () {
43
branches)
44
sed -e 's/#.*//' "$GIT_DIR/branches/$1" ;;
45
branches-partial)
46
- token=$(expr "$1" : '\([^/]*\)/')
47
- remainder=$(expr "$1" : '[^/]*/\(.*\)')
46
+ token=$(expr "z$1" : 'z\([^/]*\)/')
47
+ remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
48
url=$(sed -e 's/#.*//' "$GIT_DIR/branches/$token")
49
echo "$url/$remainder"
50
;;
@@ -77,13 +77,13 @@ canon_refs_list_for_fetch () {
77
force=
78
case "$ref" in
79
+*)
80
- ref=$(expr "$ref" : '\+\(.*\)')
80
+ ref=$(expr "z$ref" : 'z\+\(.*\)')
81
force=+
82
;;
83
esac
84
- expr "$ref" : '.*:' >/dev/null || ref="${ref}:"
85
- remote=$(expr "$ref" : '\([^:]*\):')
86
- local=$(expr "$ref" : '[^:]*:\(.*\)')
84
+ expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
85
+ remote=$(expr "z$ref" : 'z\([^:]*\):')
86
+ local=$(expr "z$ref" : 'z[^:]*:\(.*\)')
87
case "$remote" in
88
'') remote=HEAD ;;
89
refs/heads/* | refs/tags/* | refs/remotes/*) ;;
@@ -97,7 +97,7 @@ canon_refs_list_for_fetch () {
97
*) local="refs/heads/$local" ;;
98
esac
99
100
- if local_ref_name=$(expr "$local" : 'refs/\(.*\)')
100
+ if local_ref_name=$(expr "z$local" : 'zrefs/\(.*\)')
101
then
102
git-check-ref-format "$local_ref_name" ||
103
die "* refusing to create funny ref '$local_ref_name' locally"
@@ -171,7 +171,7 @@ get_remote_refs_for_fetch () {
171
172
resolve_alternates () {
173
# original URL (xxx.git)
174
- top_=`expr "$1" : '\([^:]*:/*[^/]*\)/'`
174
+ top_=`expr "z$1" : 'z\([^:]*:/*[^/]*\)/'`
175
while read path
176
do
177
case "$path" in
git-rebase.sh
+1
-1
@@ -94,7 +94,7 @@ case "$#" in
94
;;
95
*)
96
branch_name=`git symbolic-ref HEAD` || die "No current branch"
97
- branch_name=`expr "$branch_name" : 'refs/heads/\(.*\)'`
97
+ branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
98
;;
99
esac
100
branch=$(git-rev-parse --verify "${branch_name}^0") || exit
git-tag.sh
+1
-1
@@ -75,7 +75,7 @@ git-check-ref-format "tags/$name" ||
75
object=$(git-rev-parse --verify --default HEAD "$@") || exit 1
76
type=$(git-cat-file -t $object) || exit 1
77
tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
78
-: ${username:=$(expr "$tagger" : '\(.*>\)')}
78
+: ${username:=$(expr "z$tagger" : 'z\(.*>\)')}
79
80
trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0
81