From patchwork Wed Oct 7 07:20:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1377807 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=JQgGW/lc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C5m3X12Qzz9s0b for ; Wed, 7 Oct 2020 18:21:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D704C823C9; Wed, 7 Oct 2020 09:21:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="JQgGW/lc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5120B823CF; Wed, 7 Oct 2020 09:21:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0713.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::713]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4FE74823A1 for ; Wed, 7 Oct 2020 09:21:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FTg6OLMRh2ogL7Z7mN7Jy9oKxDF3dxO1fkbwCKCN1NuFxt00U1tpgb5OhPaYWiEBKZwSRvOCOf7ysDE/2oRsbWBKKBMkZMt5d+Tu7lCZ4cbMkOHnSkHXLqfsBVWtS8hH5QbQ+zU0KGZKE1HG5Xm0IAxNNwcJnwEWGseALgAIy03xExw95wJ+lbYgUpt/zGFKjXq2zaDjS/NBpuCuoE+yDZ0oI6rqydb4ovqyR6SpcZEUCwTno1fmYeqzbHH6wAA/0kIIJYtsGx08NxuwyqFH1kM1wMN8f8Ieq0vl7OPAUnlMpW5a6BEBxg2p5V9yiJn/7xY+R+tUJ3q0vBzx25TRrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BBP2JoQF4zP2NirhLtPS3/og8iocgamSPas8S0h47Lk=; b=fY3fdbhtzhXcyl7ehkvIRYQPuc8WOMEIaspddqCu5m/Jj/hdwSY9S6Onz9QB/eQradPY93Fj2SrH1yTJdq0y0nbvQsZuiqx8gSKiaJss+OGUPr02mfYaLI/hkdDWKaasTLMSh9wQy/XtKy45AeomZhDRsl9MTn3aE6p3X+91OveCHG+HSkohAusheB7tZKF5ReyfOzp7WusXLK6cysVpIo4p5htlZr5VU8SEIz3zfxd6R56sOy9Fa9fHkaU48TcG1Gtvww4KT0da1aCin1mH4Qsxd5+x2lVQYpwlSkHLINlnZIIGZWpyJILvLKWtOVbXpbBYDrhX3EZHMkJjU6TRYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BBP2JoQF4zP2NirhLtPS3/og8iocgamSPas8S0h47Lk=; b=JQgGW/lcJ+lHRoe2LDs2tLapvwA+MM2g6CskNBF3dnAP9TCTX35Azdnos7/VTq7J8JySTrHBc3DsIK4xKHO6ytPz26ByI3ekxOehyK6pWusAAInISR0OquykMx7uiGb4YqLR63SNixfL9NAXQPcSdDk0QhfaeS/ZjTMQOS2fffk= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=prevas.dk; Received: from AM6PR10MB1880.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:2f::12) by AM7PR10MB3333.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.22; Wed, 7 Oct 2020 07:21:05 +0000 Received: from AM6PR10MB1880.EURPRD10.PROD.OUTLOOK.COM ([fe80::dc8a:f8d9:a15f:44ce]) by AM6PR10MB1880.EURPRD10.PROD.OUTLOOK.COM ([fe80::dc8a:f8d9:a15f:44ce%7]) with mapi id 15.20.3433.045; Wed, 7 Oct 2020 07:21:05 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Wolfgang Denk , Tom Rini , Rasmus Villemoes Subject: [PATCH v2 1/3] cli_hush.c: refactor handle_dollar() to prepare for "run with arguments" Date: Wed, 7 Oct 2020 09:20:50 +0200 Message-Id: <20201007072052.28200-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20201007072052.28200-1-rasmus.villemoes@prevas.dk> References: <20200925111942.4629-1-rasmus.villemoes@prevas.dk> <20201007072052.28200-1-rasmus.villemoes@prevas.dk> X-Originating-IP: [81.216.59.226] X-ClientProxiedBy: AM0PR04CA0005.eurprd04.prod.outlook.com (2603:10a6:208:122::18) To AM6PR10MB1880.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:2f::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (81.216.59.226) by AM0PR04CA0005.eurprd04.prod.outlook.com (2603:10a6:208:122::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 07:21:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76032785-32bc-4f1f-2638-08d86a918d8f X-MS-TrafficTypeDiagnostic: AM7PR10MB3333: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cumy2NJGFeZKN+bCM5PTD8cxqeOyw1c9ScFvyl5SJBjaa1qlDT0EVZgOPmJ5Wi37fnHq5kj8Yi+oIOVJwmVUV4oOngcmgM84PqblJ2q1vqZKRoWhKi6QEuRnRiJj8/VDAZHkB13acs27ZMrwgQIK2H9h/g8g+MHJnjXYMZt5udsDB9sLSgEqleXwRmDEMy+68OosLExBQ3NTFJnez0wZbX0y2GbkjgPryIm5iOennNoLxEpjzLRuFYWYgbnReICrBXsOMdI2R31enftFpVBdvgrBQzs4dF//tHSKR+uzcOEucqRbFPDbg1FbT2B3HqUrSw7S5y25wo2rKkymmZ9kiw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR10MB1880.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(396003)(346002)(136003)(39840400004)(366004)(376002)(107886003)(66476007)(66556008)(8676002)(36756003)(66946007)(26005)(16526019)(8976002)(8936002)(186003)(6512007)(478600001)(2616005)(956004)(6506007)(6486002)(5660300002)(1076003)(52116002)(83380400001)(54906003)(4326008)(6666004)(86362001)(316002)(44832011)(2906002)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 3ymxLSRmPAxWkJ2KT5pobq8GlddqeJRiQ4X9otn5m7sljP3hugD5nXTzEKTc1WFTrvixs1Z2vWjmXwfIWP7+d4rq8y0DIUd8R6mtPfpshQt45fgAberJ3WjT6tj6Ped4G48NNzcW9xO3nVIjqz1S0NU7+148/8/vPmI+pbuoQwTwuHRA4xblz5m5eNdVkf++Is4+iwp3Ul0O3m/w1HwrHMvTwAl2sndXoKqkMBmjJUwWhNL8m48EMHkI5eIFknB2LnVFmxrvRYi6z1/LooNcwsKq2zWftPecH9N7SmtbeFMy5XBNbK7fnU6qZCuSP4tFo6tNxrC4xCsZUI39HWXdTMGSWQPIRDT1YmlAvTIEnuEMPaQWyxrUm5/Ck1mpG6VzdY8E8sctDXIsPcK0uzfWt/bmaIz/qKdzux2sph9Ys/+ygbYoGaPaiXS8u4N7nPUJR9EF4JLKNyAMHQgZh1xzQjXAnDi/Wj1M7DBikUqDcX2buTNAv0O+eq/c3xxm4bH7M+wV+1guNoIjdQeHNg6vxLtgonDW60n020wHhqgjcrOiKArEBTxPytCtIkmVZa4my0ArTZXA175DtVOsr4XM9UD03Aybv3RIL8Z0Qm5/GkYlLh0eRePNIm9n8uu1YJ856wX86gtbdGoAhqbqwkU7+Q== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 76032785-32bc-4f1f-2638-08d86a918d8f X-MS-Exchange-CrossTenant-AuthSource: AM6PR10MB1880.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 07:21:05.3154 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jThxU+Wibg8STxOi+XY9OloBnmcIZGyLZJTJ5zf4rhY6gSpjBRnTkqN3ujNm1UiFIygXlaDoRbes9c0RY1eCHK/23BEDxyGbVCWorW8UBrw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3333 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean A later patch will add handling of $1 through $9 as well as $#, using the same SPECIAL_VAR_SYMBOL handling as is currently used for $?. So move that case to an explicit #ifdef __U_BOOT__ branch, and consolidate a few of the #ifndef __U_BOOT__ cases, making it easier to see the original hush code. No functional change. Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- common/cli_hush.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/common/cli_hush.c b/common/cli_hush.c index 5b1f119074..072b871f1e 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -2863,6 +2863,16 @@ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *i advance = 1; #endif } else switch (ch) { +#ifdef __U_BOOT__ + case '?': + ctx->child->sp++; + b_addchr(dest, SPECIAL_VAR_SYMBOL); + b_addchr(dest, '$'); + b_addchr(dest, '?'); + b_addchr(dest, SPECIAL_VAR_SYMBOL); + advance = 1; + break; +#endif #ifndef __U_BOOT__ case '$': b_adduint(dest,getpid()); @@ -2872,20 +2882,10 @@ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *i if (last_bg_pid > 0) b_adduint(dest, last_bg_pid); advance = 1; break; -#endif case '?': -#ifndef __U_BOOT__ b_adduint(dest,last_return_code); -#else - ctx->child->sp++; - b_addchr(dest, SPECIAL_VAR_SYMBOL); - b_addchr(dest, '$'); - b_addchr(dest, '?'); - b_addchr(dest, SPECIAL_VAR_SYMBOL); -#endif advance = 1; break; -#ifndef __U_BOOT__ case '#': b_adduint(dest,global_argc ? global_argc-1 : 0); advance = 1;