Deal properly with client arguments with spaces in. (Aharon Robbins).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@118

diff --git a/coregrind/valgrind.in b/coregrind/valgrind.in
index 40bb6c959d084cec0494955e40f0207e9a478b25..d16b5d96645cc57279cd83594c6dedbf306f11b7 100755 (executable)
--- a/coregrind/valgrind.in
+++ b/coregrind/valgrind.in
@@ -29,8 +29,9 @@ dousage=0
 doversion=0
 
 # Collect up args for Valgrind
-for arg
+while [ $+ != 0 ]
 do
+  arg=$1
   case "$arg" in
 #   options for the user
     --help)                 dousage=1; break;;
@@ -97,20 +98,12 @@ do
   esac
 done
 
-# Collect up the prog and args to run
-for arg
-do
-  case "$arg" in
-   *)     argopts="$argopts $arg"; shift;;
-  esac
-done
-
 if [ z"$doversion" = z1 ]; then
    echo "valgrind-$version"
    exit 1
 fi
 
-if [ z"$argopts" = z   -o   z"$dousage" = z1 ]; then
+if [ $# = 0 ] || [ z"$dousage" = z1 ]; then
    echo
    echo "usage: $vgname [options] prog-and-args"
    echo
@@ -174,4 +167,4 @@ LD_PRELOAD=valgrind.so:$LD_PRELOAD
 export LD_PRELOAD
 #LD_DEBUG=files
 #export LD_DEBUG
-exec $argopts
+exec "$@"

diff --git a/valgrind.in b/valgrind.in
index 40bb6c959d084cec0494955e40f0207e9a478b25..d16b5d96645cc57279cd83594c6dedbf306f11b7 100755 (executable)
--- a/valgrind.in
+++ b/valgrind.in
@@ -29,8 +29,9 @@ dousage=0
 doversion=0
 
 # Collect up args for Valgrind
-for arg
+while [ $+ != 0 ]
 do
+  arg=$1
   case "$arg" in
 #   options for the user
     --help)                 dousage=1; break;;
@@ -97,20 +98,12 @@ do
   esac
 done
 
-# Collect up the prog and args to run
-for arg
-do
-  case "$arg" in
-   *)     argopts="$argopts $arg"; shift;;
-  esac
-done
-
 if [ z"$doversion" = z1 ]; then
    echo "valgrind-$version"
    exit 1
 fi
 
-if [ z"$argopts" = z   -o   z"$dousage" = z1 ]; then
+if [ $# = 0 ] || [ z"$dousage" = z1 ]; then
    echo
    echo "usage: $vgname [options] prog-and-args"
    echo
@@ -174,4 +167,4 @@ LD_PRELOAD=valgrind.so:$LD_PRELOAD
 export LD_PRELOAD
 #LD_DEBUG=files
 #export LD_DEBUG
-exec $argopts
+exec "$@"