From owner-svn-src-all@FreeBSD.ORG  Sat Apr 23 05:24:18 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E069106564A;
	Sat, 23 Apr 2011 05:24:18 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CFA58FC13;
	Sat, 23 Apr 2011 05:24:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3N5OIRi073171;
	Sat, 23 Apr 2011 05:24:18 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3N5OIVh073168;
	Sat, 23 Apr 2011 05:24:18 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104230524.p3N5OIVh073168@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 23 Apr 2011 05:24:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220963 - head/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Apr 2011 05:24:18 -0000

Author: dougb
Date: Sat Apr 23 05:24:17 2011
New Revision: 220963
URL: http://svn.freebsd.org/changeset/base/220963

Log:
  Improve the error handling for the new get_pidfile_from_conf()

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Sat Apr 23 04:26:31 2011	(r220962)
+++ head/etc/rc.subr	Sat Apr 23 05:24:17 2011	(r220963)
@@ -399,12 +399,16 @@ wait_for_pids()
 #
 get_pidfile_from_conf()
 {
+	if [ -z "$1" -o -z "$2" ]; then
+		err 3 "USAGE: get_pidfile_from_conf string file ($name)"
+	fi
+
 	local string file line
 
 	string="$1" ; file="$2"
 
-	if [ -z "$string" -o -z "$file" ] || [ ! -s "$file" ]; then
-		err 3 'USAGE: get_pidfile_from_conf string file'
+	if [ ! -s "$file" ]; then
+		err 3 "get_pidfile_from_conf: $file does not exist ($name)"
 	fi
 
 	while read line; do