Use local variables in getconf & printconf.

[matthijs/upstream/backupninja.git] / lib / tools.in

diff --git a/lib/tools.in b/lib/tools.in
index a6dcf269ef2dfb6592b7247a779f6176ccaf8463..9879e741039a5994bd544fd8e60896c9612d6cd5 100644 (file)
--- 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,10 +48,7 @@ function printconf() {
 # same name. If it is empty or not found, $2 is used.
 #
 function getconf() {
-   ret=`printconf "$1" "$2"`
-
-   # replace * with %, so that it is not globbed.
-   ret="${ret//\\*/__star__}"
+   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