From owner-svn-src-head@FreeBSD.ORG  Sun Oct 14 23:45:57 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1C1382DB;
 Sun, 14 Oct 2012 23:45:57 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 0538E8FC0A;
 Sun, 14 Oct 2012 23:45:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9ENjuJR067289;
 Sun, 14 Oct 2012 23:45:56 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9ENjuCN067287;
 Sun, 14 Oct 2012 23:45:56 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201210142345.q9ENjuCN067287@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sun, 14 Oct 2012 23:45:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241565 - head/usr.sbin/sysrc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Oct 2012 23:45:57 -0000

Author: dteske
Date: Sun Oct 14 23:45:56 2012
New Revision: 241565
URL: http://svn.freebsd.org/changeset/base/241565

Log:
  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)

Modified:
  head/usr.sbin/sysrc/sysrc

Modified: head/usr.sbin/sysrc/sysrc
==============================================================================
--- head/usr.sbin/sysrc/sysrc	Sun Oct 14 23:07:54 2012	(r241564)
+++ head/usr.sbin/sysrc/sysrc	Sun Oct 14 23:45:56 2012	(r241565)
@@ -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