Split a part of getconf into printconf.

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

diff --git a/lib/tools.in b/lib/tools.in
index 929826b2eacb252213abce10c2d553ed6b971c71..888dad133b627b3bd0d4a12f565609d8c127b40f 100644 (file)
--- a/lib/tools.in
+++ b/lib/tools.in
@@ -27,11 +27,10 @@ function setsection() {
 }
 
 #
 }
 
 #

-# sets a global var with name equal to $1
-# to the value of the configuration parameter $1
-# $2 is the default.
-#
-function getconf() {
+# Retrieves the configuration variable named $1 from the current config
+# 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`
    # if nothing is returned, set the default
    CURRENT_PARAM=$1
    ret=`@AWK@ -f $libdirectory/parseini S=$CURRENT_SECTION P=$CURRENT_PARAM $CURRENT_CONF_FILE`
    # if nothing is returned, set the default


@@ -39,6 +38,18 @@ function getconf() {
       ret="$2"
    fi
 
       ret="$2"
    fi
 

+   echo "$ret"
+}
+
+
+#
+# Retrieves the configuration variable named $1 from the current config
+# file and section and assigns its value to the global variable with the
+# 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__}"
 
    # replace * with %, so that it is not globbed.
    ret="${ret//\\*/__star__}"