From nobody Wed Apr 2 06:52:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552417554482360.0334715133595; Tue, 12 Mar 2019 12:05:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:58164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3mih-0004CN-CK for importer@patchew.org; Tue, 12 Mar 2019 15:05:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3mf0-0000PZ-7B for qemu-devel@nongnu.org; Tue, 12 Mar 2019 15:01:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3mZt-0001Hu-LT for qemu-devel@nongnu.org; Tue, 12 Mar 2019 14:56:42 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:61842 helo=smtp.ehu.eus) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3mZt-0001G5-AK for qemu-devel@nongnu.org; Tue, 12 Mar 2019 14:56:41 -0400 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 986D732C79; Tue, 12 Mar 2019 19:56:39 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B5B811004A; Tue, 12 Mar 2019 19:56:39 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5DC84110045; Tue, 12 Mar 2019 19:56:39 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Tue, 12 Mar 2019 19:56:39 +0100 (CET) Received: from 803a063d172d (unknown [139.47.78.33]) by smtp1 (Postfix) with ESMTPSA id 13D9432C79; Tue, 12 Mar 2019 19:56:39 +0100 (CET) Date: Tue, 12 Mar 2019 18:56:34 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190312185634.GA15@803a063d172d> References: <20190312185541.GA13@803a063d172d> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190312185541.GA13@803a063d172d> User-Agent: Mutt/1.11.2 (2019-01-07) X-Greylist: ACL 177 matched, not delayed by milter-greylist-4.4.3 (smtp1); Tue, 12 Mar 2019 19:56:39 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.2.0.1013-24486.002 X-TM-AS-Result: No-0.937-7.0-31-10 X-imss-scan-details: No-0.937-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24486.002 X-TMASE-Result: 10-0.937300-10.000000 X-TMASE-MatchedRID: hwtUKlde9zE8mRT0SYY6fkvrB8UvzFr4viRliDV2nyxLgo8+IIHbcKyJ SPZ1MHFJyQUI9mjBTGrMJYD0aRF0RSvslLrYzXFMoMfp2vHck9X54F/2i/DwjTqI/Q1zONHSo3u yF/fzkXbL7a7vhpw6CH8mA3sDDq0A5vGrSCzt19MV7NKYhc1lOfoLR4+zsDTtQh+ArmEemWXzI8 5BvSDQEnjU4PjpPPRsLP70QQn0w25js9mwfpYMG/kUxKdM2YBcxqaFumKRJvRZapFMt7EZ+/7Nb EwbVh/qW8Mo9oUVlaBTq+NyuVQu+IbhWbmaLtpNkm94VhWUY9vjdetbrmPKzVXK9tOD+u6c X-TMASE-SNAP-Result: 1.821001.0001-0-1-12:0,22:0,33:0,34:0-0 X-Greylist: Sender IP whitelisted, Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (postfix.smtp1.imsva1); Tue, 12 Mar 2019 19:56:39 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 158.227.0.66 Subject: [Qemu-devel] [PATCH v6 1/9] qemu-binfmt-conf.sh: enforce safe style consistency X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: riku.voipio@iki.fi, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Spaces are added before '; then', for consistency. All the tests are prefixed with 'x', in order to avoid risky comparisons (i.e. a user deliberately trying to provoke a syntax error). Signed-off-by: Unai Martinez-Corral Reviewed-by: Laurent Vivier --- scripts/qemu-binfmt-conf.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index b5a16742a1..0009385be2 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -219,12 +219,12 @@ qemu_check_access() { qemu_check_bintfmt_misc() { # load the binfmt_misc module - if [ ! -d /proc/sys/fs/binfmt_misc ]; then + if [ ! -d /proc/sys/fs/binfmt_misc ] ; then if ! /sbin/modprobe binfmt_misc ; then exit 1 fi fi - if [ ! -f /proc/sys/fs/binfmt_misc/register ]; then + if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then if ! mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc ; then exit 1 fi @@ -255,10 +255,10 @@ qemu_check_systemd() { qemu_generate_register() { flags=3D"" - if [ "$CREDENTIAL" =3D "yes" ] ; then + if [ "x$CREDENTIAL" =3D "xyes" ] ; then flags=3D"OC" fi - if [ "$PERSISTENT" =3D "yes" ] ; then + if [ "x$PERSISTENT" =3D "xyes" ] ; then flags=3D"${flags}F" fi @@ -296,18 +296,18 @@ qemu_set_binfmts() { mask=3D$(eval echo \$${cpu}_mask) family=3D$(eval echo \$${cpu}_family) - if [ "$magic" =3D "" ] || [ "$mask" =3D "" ] || [ "$family" =3D ""= ] ; then + if [ "x$magic" =3D "x" ] || [ "x$mask" =3D "x" ] || [ "x$family" = =3D "x" ] ; then echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2 continue fi qemu=3D"$QEMU_PATH/qemu-$cpu" - if [ "$cpu" =3D "i486" ] ; then + if [ "x$cpu" =3D "xi486" ] ; then qemu=3D"$QEMU_PATH/qemu-i386" fi qemu=3D"$qemu$QEMU_SUFFIX" - if [ "$host_family" !=3D "$family" ] ; then + if [ "x$host_family" !=3D "x$family" ] ; then $BINFMT_SET fi done -- 2.21.0