From 1e907e0eb63001a272319f4dbdccaab6b890a772 Mon Sep 17 00:00:00 2001
From: Krisztian Litkey <krisztian.litkey@nokia.com>
Date: Fri, 29 Oct 2010 19:57:39 +0300
Subject: Better shave argument protection.

---
 build-aux/shave-libtool.in |  6 +++---
 build-aux/shave.in         | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build-aux/shave-libtool.in b/build-aux/shave-libtool.in
index 54ebd69..0f7fb12 100644
--- a/build-aux/shave-libtool.in
+++ b/build-aux/shave-libtool.in
@@ -65,7 +65,7 @@ while test "$#" -gt 0; do
         preserved_args="$preserved_args $opt"
 	;;
     *)
-        preserved_args="$preserved_args $opt"
+        preserved_args="$preserved_args '$opt'"
         ;;
       esac
 done
@@ -102,8 +102,8 @@ if test -z $V; then
     if test $pass_though -eq 0; then
         echo "$Q$output"
     fi
-    $LIBTOOL --silent $tag $preserved_args
+    eval "$LIBTOOL --silent $tag $preserved_args"
 else
     echo $LIBTOOL $tag $preserved_args
-    $LIBTOOL $tag $preserved_args
+    eval "$LIBTOOL $tag $preserved_args"
 fi
diff --git a/build-aux/shave.in b/build-aux/shave.in
index 32249cd..461a1bf 100644
--- a/build-aux/shave.in
+++ b/build-aux/shave.in
@@ -54,14 +54,14 @@ while test "$#" -gt 0; do
         ;;
     -o)
         lt_output="$1"
-        preserved_args="$preserved_args ${opt//\"/\\\"}"
+        preserved_args="$preserved_args $opt"
         ;;
     -out:*|/out:*)
         lt_output="${opt#-out:}"
-        preserved_args="$preserved_args ${opt//\"/\\\"}"
+        preserved_args="$preserved_args $opt"
         ;;
     *)
-        preserved_args="$preserved_args ${opt//\"/\\\"}"
+        preserved_args="$preserved_args '$opt'"
         ;;
       esac
 done
@@ -105,8 +105,8 @@ if test -z $V; then
     if test $pass_through -eq 0; then
         echo "$Q$output"
     fi
-    eval $REEL_TOOL $preserved_args
+    eval "$REEL_TOOL $preserved_args"
 else
     echo $REEL_TOOL $preserved_args
-    eval $REEL_TOOL $preserved_args
+    eval "$REEL_TOOL $preserved_args"
 fi
-- 
cgit v1.2.3