diff options
| author | dteske <dteske@FreeBSD.org> | 2012-10-14 23:45:56 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2012-10-14 23:45:56 +0000 |
| commit | e9a568a0e36372f36cec098bc171e529467b49d4 (patch) | |
| tree | d822c7158323a9842dab4f3dff76134b0b484b6d /usr.sbin/sysrc | |
| parent | 2758da7262ce5bb3a3569e6b7eac390f6cea3e3b (diff) | |
| download | FreeBSD-src-e9a568a0e36372f36cec098bc171e529467b49d4.zip FreeBSD-src-e9a568a0e36372f36cec098bc171e529467b49d4.tar.gz | |
Mirror the changes made in SVN r240798:
Replace "( : ${var?} )" syntax with better "[ ${var+set} ]" syntax.
Reviewed by: adrian (co-mentor)
Approved by: adrian (co-mentor)
Diffstat (limited to 'usr.sbin/sysrc')
| -rw-r--r-- | usr.sbin/sysrc/sysrc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc index 24a304d..e1c15d6 100644 --- a/usr.sbin/sysrc/sysrc +++ b/usr.sbin/sysrc/sysrc @@ -251,7 +251,7 @@ shift $(( $OPTIND - 1 )) # Taint-check all rc.conf(5) files # errmsg="$pgm: Exiting due to previous syntax errors" -if ( : ${RC_CONFS?} ) > /dev/null 2>&1; then +if [ "${RC_CONFS+set}" ]; then ( for i in $RC_CONFS; do [ -e "$i" ] || continue /bin/sh -n "$i" || exit $FAILURE @@ -311,7 +311,7 @@ if [ "$JAIL" -o "$ROOTDIR" ]; then $( [ "$SHOW_VALUE" ] || echo \ -N ) $( [ "$SHOW_FILE" ] && echo \ -F ) " - if ( : ${RC_CONFS?} ) > /dev/null 2>&1; then + if [ "${RC_CONFS+set}" ]; then args="$args -f '$RC_CONFS'" fi for arg in "$@"; do @@ -437,8 +437,7 @@ if [ "$SHOW_ALL" ]; then # explicit value, modifying the default behavior of # source_rc_confs(). # - ( : ${RC_CONFS?} ) > /dev/null 2>&1 && - rc_conf_files="$RC_CONFS" + [ "${RC_CONFS+set}" ] && rc_conf_files="$RC_CONFS" source_rc_confs |
