}
#
-# 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
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__}"
- # this is weird, but single quotes are needed to
- # allow for returned values with spaces. $ret is still expanded
- # because it is in an 'eval' statement.
- eval $1='$ret'
+ # 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
+ # (without the backslash, the right part of the assignment would be
+ # whatever is in ret and be subject to all kinds of expansion.
+ eval $1=\$ret
}