X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=usttrace;h=af80faf76afd3adf7eae740e8f75bc5a910e5abd;hb=f446d1cbf3f3b2e722b68b6bcbee2359d0f3d8e5;hp=7c34ca2f4107cfe234c66297a2f1c564fbf781f2;hpb=37b70e91e2d7e89099b4b35978b9cc033bf37673;p=ust.git

diff --git a/usttrace b/usttrace
index 7c34ca2..af80faf 100755
--- a/usttrace
+++ b/usttrace
@@ -1,19 +1,19 @@
-#!/bin/bash
+#!/bin/sh
 
 # usttrace  by Pierre-Marc Fournier 2009
 # Distributed under the GPLv2.
 
-function error() {
+error() {
 	echo "$0: error: $1" 2>/dev/stderr
 }
 
-function sighandler() {
+sighandler() {
 	echo "Caught Ctrl-C"
 	if [ -z "${UST_CONSUMERD_PID}" ]; then
-		UST_CONSUMERD_PID="$(<$pidfilepath)"
+		UST_CONSUMERD_PID=`cat $pidfilepath`
 	fi
 	# Tell the daemon to die
-	kill -SIGTERM "${UST_CONSUMERD_PID}"
+	kill -TERM "${UST_CONSUMERD_PID}"
 
 	echo "Waiting for ust-consumerd to shutdown..."
 	wait "${UST_CONSUMERD_PID}"
@@ -44,7 +44,7 @@ fi
 
 BASE_TRACE_DIR="${HOME}/.usttraces"
 
-function usage () {
+usage() {
 	echo "usage:  $0 OPTIONS COMMAND" 2>/dev/stderr
 	echo "" 2>/dev/stderr
 	echo "Options:" 2>/dev/stderr
@@ -123,7 +123,7 @@ UST_CONSUMERD_SOCKPATH="/tmp/ust-consumerd-sock-$$"
 if [ "$arg_syswide_daemon" != "1" ];
 then
 	pidfilepath="/tmp/usttrace-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid"
-	trap "sighandler $pidfilepath" SIGINT
+	trap "sighandler $pidfilepath" INT
 	mkfifo -m 0600 "$pidfilepath"
 	# Start daemon
 	${UST_CONSUMERD} --pidfile "$pidfilepath" -s "${UST_CONSUMERD_SOCKPATH}" -o "$OUTDIR" >"$OUTDIR/ust-consumerd.log" 2>&1 &
@@ -134,7 +134,7 @@ then
 	# ust-consumerd writes to pidfile
 	# ust-consumerd closes pidfile
 	# we unblock reading pidfile
-	UST_CONSUMERD_PID="$(<$pidfilepath)"
+	UST_CONSUMERD_PID=`cat $pidfilepath`
 	export UST_DAEMON_SOCKET="${UST_CONSUMERD_SOCKPATH}"
 fi
 
@@ -206,7 +206,7 @@ fi
 if [ "$arg_syswide_daemon" != "1" ];
 then
 	# Tell the daemon to die
-	kill -SIGTERM "${UST_CONSUMERD_PID}"
+	kill -TERM "${UST_CONSUMERD_PID}"
 
 	echo "Waiting for ust-consumerd to shutdown..."
 	wait "${UST_CONSUMERD_PID}"