diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2015-08-13 07:06:41 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2015-08-13 07:06:41 +0000 |
| commit | 2f055ba1eaa5007050dbaf161dc9b139c451206b (patch) | |
| tree | 9b08f6851de289a3c2e5b96bebad2aef02103ded /usr.sbin/sysmerge | |
| parent | Zap a few stray blanks. (diff) | |
| download | wireguard-openbsd-2f055ba1eaa5007050dbaf161dc9b139c451206b.tar.xz wireguard-openbsd-2f055ba1eaa5007050dbaf161dc9b139c451206b.zip | |
Sync stripcom() with /etc/rc.
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 0134ff9afd7..a8d40cd8880 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.197 2015/07/18 20:27:37 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.198 2015/08/13 07:06:41 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -24,18 +24,16 @@ usage() { echo "usage: ${0##*/} [-bdp]" >&2 && exit 1 } -# OpenBSD /etc/rc v1.438 +# OpenBSD /etc/rc v1.456 stripcom() { - local _file=$1 - local _line - - { - while read _line ; do - _line=${_line%%#*} # strip comments - test -z "$_line" && continue - echo $_line - done - } < $_file + local _file=$1 _line + + [[ -s $_file ]] || return + + while read _line ; do + _line=${_line%%#*} + [[ -n $_line ]] && print -r -- "$_line" + done <$_file } sm_error() { |