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

Improve the error handling for the new get_pidfile_from_conf()

Browse Source
This commit is contained in:
Doug Barton 2011-04-23 05:24:17 +00:00
parent 8028832653
commit b1850238b7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/rc.subr
View File

@ -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