undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cp/git-web-browse-browsers'

Browse Source 
* cp/git-web-browse-browsers:
  git-web--browse: avoid the use of eval
This commit is contained in:
Junio C Hamano 2011-10-13 19:03:20 -07:00
commit 8626238800
2 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-web--browse.sh
View File

@ -156,7 +156,7 @@ firefox|iceweasel|seamonkey|iceape)
;; ;;
google-chrome|chrome|chromium|chromium-browser) google-chrome|chrome|chromium|chromium-browser)
# No need to specify newTab. It's default in chromium # No need to specify newTab. It's default in chromium
eval "$browser_path" "$@" & "$browser_path" "$@" &
;; ;;
konqueror) konqueror)
case "$(basename "$browser_path")" in case "$(basename "$browser_path")" in
@ -164,10 +164,10 @@ konqueror)
# It's simpler to use kfmclient to open a new tab in konqueror. # It's simpler to use kfmclient to open a new tab in konqueror.
browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')" browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')"
type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found." type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found."
eval "$browser_path" newTab "$@" "$browser_path" newTab "$@" &
;; ;;
kfmclient) kfmclient)
eval "$browser_path" newTab "$@" "$browser_path" newTab "$@" &
;; ;;
*) *)
"$browser_path" "$@" & "$browser_path" "$@" &
@ -175,7 +175,7 @@ konqueror)
esac esac
;; ;;
w3m|elinks|links|lynx|open) w3m|elinks|links|lynx|open)
eval "$browser_path" "$@" "$browser_path" "$@"
;; ;;
start) start)
exec "$browser_path" '"web-browse"' "$@" exec "$browser_path" '"web-browse"' "$@"
@ -185,7 +185,7 @@ opera|dillo)
;; ;;
*) *)
if test -n "$browser_cmd"; then if test -n "$browser_cmd"; then
( eval $browser_cmd "$@" ) ( eval "$browser_cmd \"\$@\"" )
fi fi
;; ;;
esac esac

66
t/t9901-git-web--browse.sh Executable file
View File

@ -0,0 +1,66 @@
#!/bin/sh
#
test_description='git web--browse basic tests
This test checks that git web--browse can handle various valid URLs.'
. ./test-lib.sh
test_expect_success \
'URL with an ampersand in it' '
echo http://example.com/foo\&bar >expect &&
git config browser.custom.cmd echo &&
git web--browse --browser=custom \
http://example.com/foo\&bar >actual &&
test_cmp expect actual
'
test_expect_success \
'URL with a semi-colon in it' '
echo http://example.com/foo\;bar >expect &&
git config browser.custom.cmd echo &&
git web--browse --browser=custom \
http://example.com/foo\;bar >actual &&
test_cmp expect actual
'
test_expect_success \
'URL with a hash in it' '
echo http://example.com/foo#bar >expect &&
git config browser.custom.cmd echo &&
git web--browse --browser=custom \
http://example.com/foo#bar >actual &&
test_cmp expect actual
'
test_expect_success \
'browser paths are properly quoted' '
echo fake: http://example.com/foo >expect &&
cat >"fake browser" <<-\EOF &&
#!/bin/sh
echo fake: "$@"
EOF
chmod +x "fake browser" &&
git config browser.w3m.path "`pwd`/fake browser" &&
git web--browse --browser=w3m \
http://example.com/foo >actual &&
test_cmp expect actual
'
test_expect_success \
'browser command allows arbitrary shell code' '
echo "arg: http://example.com/foo" >expect &&
git config browser.custom.cmd "
f() {
for i in \"\$@\"; do
echo arg: \$i
done
}
f" &&
git web--browse --browser=custom \
http://example.com/foo >actual &&
test_cmp expect actual
'
test_done