diff options
Diffstat (limited to 'usr.sbin/bsdconfig/startup/share/rcconf.subr')
| -rw-r--r-- | usr.sbin/bsdconfig/startup/share/rcconf.subr | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr index 1ff57fd..38b4cc8 100644 --- a/usr.sbin/bsdconfig/startup/share/rcconf.subr +++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr @@ -106,6 +106,7 @@ f_startup_rcconf_list() # f_startup_rcconf_map() { + local __funcname=f_startup_rcconf_map local __var_to_set="$1" # If the in-memory cached value is available, return it immediately @@ -128,7 +129,7 @@ f_startup_rcconf_map() # can be used to quickly populate the cache value for immediate return. # local __rc_defaults_digest - __rc_defaults_digest=$( md5 < "$RC_DEFAULTS" ) + __rc_defaults_digest=$( exec 2> /dev/null; md5 < "$RC_DEFAULTS" ) # # Check to see if the global persistant cache file exists @@ -218,8 +219,9 @@ f_startup_rcconf_map() # # Create a new temporary file to write to - local __tmpfile="$( mktemp -t "$pgm" )" - [ "$__tmpfile" ] || return $FAILURE + local __tmpfile + f_eval_catch -dk __tmpfile $__funcname mktemp \ + 'mktemp -t "%s"' "$pgm" || return $FAILURE # Write the temporary file contents echo "$__rc_defaults_digest" > "$__tmpfile" @@ -227,9 +229,11 @@ f_startup_rcconf_map() # Finally, move the temporary file into place case "$STARTUP_RCCONF_MAP_CACHEFILE" in - */*) f_quietly mkdir -p "${STARTUP_RCCONF_MAP_CACHEFILE%/*}" + */*) f_eval_catch -d $__funcname mkdir \ + 'mkdir -p "%s"' "${STARTUP_RCCONF_MAP_CACHEFILE%/*}" esac - mv "$__tmpfile" "$STARTUP_RCCONF_MAP_CACHEFILE" + f_eval_catch -d $__funcname mv \ + 'mv "%s" "%s"' "$__tmpfile" "$STARTUP_RCCONF_MAP_CACHEFILE" } # f_startup_rcconf_map_expand $var_to_get @@ -243,7 +247,7 @@ f_startup_rcconf_map() f_startup_rcconf_map_expand() { local var_to_get="$1" - eval "$( f_getvar "$var_to_get" | awk ' + eval "$( debug= f_getvar "$var_to_get" | awk ' BEGIN { rword = "^[[:space:]]*[^[:space:]]*[[:space:]]*" } |
