d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mirror the changes made in SVN r240798:

Browse Source 
Replace "( : ${var?} )" syntax with better "[ ${var+set} ]" syntax.

Reviewed by:	adrian (co-mentor)
Approved by:	adrian (co-mentor)
This commit is contained in:
Devin Teske 2012-10-14 23:45:56 +00:00
parent 2e88f5cd34
commit 42cdd52718
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/sysrc/sysrc
View File

@ -251,7 +251,7 @@ shift $(( $OPTIND - 1 ))
# Taint-check all rc.conf(5) files # Taint-check all rc.conf(5) files
# #
errmsg="$pgm: Exiting due to previous syntax errors" 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 ( for i in $RC_CONFS; do
[ -e "$i" ] || continue [ -e "$i" ] || continue
/bin/sh -n "$i" || exit $FAILURE /bin/sh -n "$i" || exit $FAILURE
@ -311,7 +311,7 @@ if [ "$JAIL" -o "$ROOTDIR" ]; then
$( [ "$SHOW_VALUE" ] || echo \ -N ) $( [ "$SHOW_VALUE" ] || echo \ -N )
$( [ "$SHOW_FILE" ] && echo \ -F ) $( [ "$SHOW_FILE" ] && echo \ -F )
" "
if ( : ${RC_CONFS?} ) > /dev/null 2>&1; then if [ "${RC_CONFS+set}" ]; then
args="$args -f '$RC_CONFS'" args="$args -f '$RC_CONFS'"
fi fi
for arg in "$@"; do for arg in "$@"; do
@ -437,8 +437,7 @@ if [ "$SHOW_ALL" ]; then
# explicit value, modifying the default behavior of # explicit value, modifying the default behavior of
# source_rc_confs(). # source_rc_confs().
# #
( : ${RC_CONFS?} ) > /dev/null 2>&1 && [ "${RC_CONFS+set}" ] && rc_conf_files="$RC_CONFS"
rc_conf_files="$RC_CONFS"
source_rc_confs source_rc_confs