From 5ce94f41b41ded6b6329cc1b13155f821204377f Mon Sep 17 00:00:00 2001 From: des Date: Sat, 10 Dec 2016 20:24:22 +0000 Subject: [PATCH] MFH (r308297): use what(1) instead of strings(1). PR: 213665 Submitted by: Pawel Worach git-svn-id: svn://svn.freebsd.org/base/stable/10@309830 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- bin/freebsd-version/freebsd-version.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/freebsd-version/freebsd-version.sh.in b/bin/freebsd-version/freebsd-version.sh.in index a830d2649..16034104d 100644 --- a/bin/freebsd-version/freebsd-version.sh.in +++ b/bin/freebsd-version/freebsd-version.sh.in @@ -36,7 +36,7 @@ USERLAND_VERSION="@@REVISION@@-@@BRANCH@@" : ${LOADER_CONF_FILES:=$LOADER_DIR/defaults/loader.conf $LOADER_DIR/loader.conf $LOADER_DIR/loader.conf.local} LOADER_RE1='^\([A-Z_a-z][0-9A-Z_a-z]*=[-./0-9A-Z_a-z]\{1,\}\).*$' LOADER_RE2='^\([A-Z_a-z][0-9A-Z_a-z]*="[-./0-9A-Z_a-z]\{1,\}"\).*$' -KERNEL_RE='^@(#)@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$' +KERNEL_RE='^@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$' progname=$(basename $0) @@ -67,7 +67,7 @@ kernel_version() { if [ ! -f "$kernfile" -o ! -r "$kernfile" ] ; then error "unable to locate kernel" fi - strings "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p" + what -qs "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p" } # -- 2.42.0