From owner-svn-src-all@freebsd.org Fri Nov 2 22:57:01 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D56BD10DE28D; Fri, 2 Nov 2018 22:57:01 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB4883054; Fri, 2 Nov 2018 22:57:00 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA2MuqsF077798; Fri, 2 Nov 2018 15:56:52 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA2Muqdg077797; Fri, 2 Nov 2018 15:56:52 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201811022256.wA2Muqdg077797@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340082 - head/sys/tools In-Reply-To: <201811022107.wA2L76I2061694@repo.freebsd.org> To: Ed Maste Date: Fri, 2 Nov 2018 15:56:52 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2018 22:57:02 -0000 > Author: emaste > Date: Fri Nov 2 21:07:06 2018 > New Revision: 340082 > URL: https://svnweb.freebsd.org/changeset/base/340082 > > Log: > embed_mfs.sh: replace some compound statements with conventional ifs > > Use the more readable form - there's no need to try being clever. This also fixes the fact that an unhandled error did not result in the exit 1 being done, though the chance of that happening (echo would have to fail) is near nil). > > Modified: > head/sys/tools/embed_mfs.sh > > Modified: head/sys/tools/embed_mfs.sh > ============================================================================== > --- head/sys/tools/embed_mfs.sh Fri Nov 2 20:56:19 2018 (r340081) > +++ head/sys/tools/embed_mfs.sh Fri Nov 2 21:07:06 2018 (r340082) > @@ -45,7 +45,10 @@ fi > > mfs_size=`stat -f '%z' $2 2> /dev/null` > # If we can't determine MFS image size - bail. > -[ -z ${mfs_size} ] && echo "Can't determine MFS image size" && exit 1 > +if [ -z ${mfs_size} ]; then > + echo "Can't determine MFS image size" > + exit 1 > +fi > > err_no_mfs="Can't locate mfs section within " > > @@ -53,7 +56,10 @@ if file -b $1 | grep -q '^ELF ..-bit .SB executable'; > > sec_info=`elfdump -c $1 2> /dev/null | grep -A 5 -E "sh_name: oldmfs$"` > # If we can't find the mfs section within the given kernel - bail. > - [ -z "${sec_info}" ] && echo "${err_no_mfs} $1" && exit 1 ^^ would not execute exit if echo failed... this is poor sh coding. > + if [ -z "${sec_info}" ]; then > + echo "${err_no_mfs} $1" > + exit 1 > + fi This fixes that possible, though highly unlikely, issue. It is also much easier to read and understand! > > sec_size=`echo "${sec_info}" | awk '/sh_size/ {print $2}' 2>/dev/null` > sec_start=`echo "${sec_info}" | \ > @@ -78,7 +84,10 @@ else > fi > > # If the mfs section size is smaller than the mfs image - bail. > -[ ${sec_size} -lt ${mfs_size} ] && echo "MFS image too large" && exit 1 > +if [ ${sec_size} -lt ${mfs_size} ]; then > + echo "MFS image too large" > + exit 1 > +fi > > # Dump the mfs image into the mfs section > dd if=$2 ibs=8192 of=$1 obs=${sec_start} oseek=1 conv=notrunc 2> /dev/null && \ > > -- Rod Grimes rgrimes@freebsd.org