From 89db30b29d2d223ab5f238d6c6e089bd001efd78 Mon Sep 17 00:00:00 2001
From: Benjamin Poirier <benjamin.poirier@polymtl.ca>
Date: Wed, 12 Aug 2009 09:18:22 -0400
Subject: [PATCH] lttv: Extra arguments in runlttv

Here's an alternate take on specifying extra arguments for LTTV in the runlttv
script. They are specified on the command line after the optionnal "helper"
program name. This is more in line with the way commands like `xargs` take
extra arguments for the executable they invoke.

Signed-off-by: Benjamin Poirier <benjamin.poirier@polymtl.ca>
---
 runlttv | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/runlttv b/runlttv
index 983b50cb..7af35b01 100755
--- a/runlttv
+++ b/runlttv
@@ -13,7 +13,6 @@
 #     ex: TRACEFILE="-t /tmp/traces/dijkstra-20071212"
 # - by setting the ARGS variable, a different set of plugins can be loaded
 #     for an example see the ARGS= line below
-# - the LTTV_ARGS environment variable may be used to add additional arguments to lttv
 #
 # In order for icons to display correctly, it might be necessary to create a
 # symlink:
@@ -42,10 +41,6 @@ else
 	exit 1
 fi
 
-for a in $@; do
-	eval $(echo $a)"=1"
-done
-
 if [ -n "$TF" ]; then
 	TRACEFILE="-t $TF"
 fi
@@ -54,14 +49,16 @@ if [ -e "$RCFILE" ]; then
 	source "$RCFILE";
 fi
 
-ARGS="$ARGS $LTTV_ARGS"
-
-if [ -n "$dbg" ]; then
-	LD_LIBRARY_PATH=ltt/.libs gdb --args $LTTV_EXEC $ARGS $TRACEFILE
-elif [ -n "$valgrind" ]; then
-	LD_LIBRARY_PATH=ltt/.libs valgrind --track-origins=yes --show-reachable=yes --leak-check=full --error-limit=no $LTTV_EXEC $ARGS $TRACEFILE
-elif [ -n "$strace" ]; then
-	LD_LIBRARY_PATH=ltt/.libs strace $LTTV_EXEC $ARGS $TRACEFILE
+HELPER=$1
+if [ "$HELPER" = "dbg" ]; then
+	shift
+	LD_LIBRARY_PATH=ltt/.libs gdb --args $LTTV_EXEC $ARGS $TRACEFILE $@
+elif [ "$HELPER" = "valgrind" ]; then
+	shift
+	LD_LIBRARY_PATH=ltt/.libs valgrind --track-origins=yes --show-reachable=yes --leak-check=full --error-limit=no $LTTV_EXEC $ARGS $TRACEFILE $@
+elif [ "$HELPER" = "strace" ]; then
+	shift
+	LD_LIBRARY_PATH=ltt/.libs strace $LTTV_EXEC $ARGS $TRACEFILE $@
 else
-	LD_LIBRARY_PATH=ltt/.libs $LTTV_EXEC $ARGS $TRACEFILE
+	LD_LIBRARY_PATH=ltt/.libs $LTTV_EXEC $ARGS $TRACEFILE $@
 fi
-- 
2.34.1