From ac1a55a22999e2161c42f8c30fb497461017d93e Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Thu, 18 Mar 2010 10:35:49 +0100 Subject: [PATCH] Use local variables in getconf & printconf. --- lib/tools.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tools.in b/lib/tools.in index 2715a00..9879e74 100644 --- a/lib/tools.in +++ b/lib/tools.in @@ -31,8 +31,8 @@ function setsection() { # file and section and echoes its value. If it is empty or not found, $2 # is used. function printconf() { - CURRENT_PARAM=$1 - ret=`@AWK@ -f $libdirectory/parseini S=$CURRENT_SECTION P=$CURRENT_PARAM $CURRENT_CONF_FILE` + local CURRENT_PARAM=$1 + local ret=`@AWK@ -f $libdirectory/parseini S=$CURRENT_SECTION P=$CURRENT_PARAM $CURRENT_CONF_FILE` # if nothing is returned, set the default if [ "$ret" == "" -a "$2" != "" ]; then ret="$2" @@ -48,7 +48,7 @@ function printconf() { # same name. If it is empty or not found, $2 is used. # function getconf() { - ret=`printconf "$1" "$2"` + local ret=`printconf "$1" "$2"` # We use escape the $ in $ret to delay expansion of $ret, so when $1 # is foo, eval sees foo=$ret and properly does the assignment -- 2.30.2