From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2EB21C4332F for ; Tue, 1 Nov 2022 19:30:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2D43D84EF3; Tue, 1 Nov 2022 20:29:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com 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=amarulasolutions.com header.i=@amarulasolutions.com header.b="X+K7VRy4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5795484F83; Tue, 1 Nov 2022 20:29:47 +0100 (CET) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 51DD884F83 for ; Tue, 1 Nov 2022 20:21:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=francis.laniel@amarulasolutions.com Received: by mail-wm1-x32e.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso2778620wme.5 for ; Tue, 01 Nov 2022 12:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4fLVG09wam0Tis79NRqas+hWjDWalGNzfl7CadSP+AU=; b=X+K7VRy44475+ulbgv2xt0ndNipLjskTDLjGaDoN3Od/hdNg64UdFfabtEFr/L2MAk KE9sJTqsw3g2f60XRQSNagw/AsojovJwbkrQK5Z1WVg/cv6u9nn+QVcs3rM1K6ylRfuz zQANAFZIW0Qe7SOEsQQ5QAQeqfwe+r+j0ouV0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4fLVG09wam0Tis79NRqas+hWjDWalGNzfl7CadSP+AU=; b=iux1JqaIu83IE87bv0/aRuWfQ/vRs4/ajn2UOOYZ/jacLNUYsGBhxcVfWW35jwMkVc jbHpwXnPHB3ptDSIYtlvwUO7TjtVajuy2Ds/+JeOkOSEoBEAE5djePrv4xDUwwpyAlFL WdbPuSjRPiO9EPSqUqCSFzEuMngI+FqbvnU21Ri82cuAUJ7vIdnvgtAU2mZr+hbfeCjW g5ehU6Li6rxMiqqUIHfNDuuuaG5PkNg90tn7lTMK3Rtwss+lW3oP42sSNTALD4izsQX0 XGR/7qKvZiOmpOIAJuo8XJ3XPLfLTCTBPdRWI0f/PTqYq2duAHjNukGLDvEftD0bX6c6 7fRw== X-Gm-Message-State: ACrzQf0qL4vzj7naFSf9l16V2hhZmA3tv2lJMz9qyVBZykZR7qvqU+c8 oXbuF/Dy4NdUwT8/nGLcDft8SuYuIJJfQg== X-Google-Smtp-Source: AMsMyM6soKEjqnqk+7qodIPSK3QUXkJQK2vBmHO3HU+c1w/zcrO8gDENFmgzPHmQU0d9qEY2cCGuAQ== X-Received: by 2002:a05:600c:554b:b0:3cf:84ea:3097 with SMTP id iz11-20020a05600c554b00b003cf84ea3097mr67838wmb.100.1667330494076; Tue, 01 Nov 2022 12:21:34 -0700 (PDT) Received: from pwmachine.numericable.fr (85-170-25-210.rev.numericable.fr. [85.170.25.210]) by smtp.gmail.com with ESMTPSA id h17-20020a5d6e11000000b002356c051b9csm10755732wrz.66.2022.11.01.12.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 12:21:33 -0700 (PDT) From: Francis Laniel To: u-boot@lists.denx.de Cc: Michael Nazzareno Trimarchi , Tom Rini , Aleksandar Gerasimovski , Holger Brunck , Francis Laniel , Simon Glass , Harald Seiler Subject: [RFC PATCH v5 21/24] cli: hush_2021: Enable loops Date: Tue, 1 Nov 2022 20:20:26 +0100 Message-Id: <20221101192029.10231-22-francis.laniel@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221101192029.10231-1-francis.laniel@amarulasolutions.com> References: <20221101192029.10231-1-francis.laniel@amarulasolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean Enables the use of for, while and until loops for command line as well as with run_command(). Signed-off-by: Francis Laniel Reviewed-by: Simon Glass --- common/cli_hush_2021.c | 1 + common/cli_hush_upstream.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common/cli_hush_2021.c b/common/cli_hush_2021.c index be8851f986..4fc712d5b2 100644 --- a/common/cli_hush_2021.c +++ b/common/cli_hush_2021.c @@ -34,6 +34,7 @@ #define ENABLE_HUSH_INTERACTIVE 1 #define ENABLE_FEATURE_EDITING 1 #define ENABLE_HUSH_IF 1 +#define ENABLE_HUSH_LOOPS 1 /* No MMU in U-Boot */ #define BB_MMU 0 #define USE_FOR_NOMMU(...) __VA_ARGS__ diff --git a/common/cli_hush_upstream.c b/common/cli_hush_upstream.c index 3b8c6a35b0..f75cc877ce 100644 --- a/common/cli_hush_upstream.c +++ b/common/cli_hush_upstream.c @@ -10351,7 +10351,7 @@ static int run_list(struct pipe *pi) #ifndef __U_BOOT__ for (; pi; pi = IF_HUSH_LOOPS(rword == RES_DONE ? loop_top : ) pi->next) { #else /* __U_BOOT__ */ - for (; pi; pi = pi->next) { + for (; pi; pi = rword == RES_DONE ? loop_top : pi->next) { #endif /* __U_BOOT__ */ int r; int sv_errexit_depth; @@ -10453,7 +10453,20 @@ static int run_list(struct pipe *pi) } /* Insert next value from for_lcur */ /* note: *for_lcur already has quotes removed, $var expanded, etc */ +#ifndef __U_BOOT__ set_local_var(xasprintf("%s=%s", pi->cmds[0].argv[0], *for_lcur++), /*flag:*/ 0); +#else /* __U_BOOT__ */ + /* We cannot use xasprintf, so we emulate it. */ + char *full_var; + char *var = pi->cmds[0].argv[0]; + char *val = *for_lcur++; + + /* + 1 to take into account =. */ + full_var = xmalloc(strlen(var) + strlen(val) + 1); + sprintf(full_var, "%s=%s", var, val); + + set_local_var_2021(full_var, /*flag:*/ 0); +#endif /* __U_BOOT__ */ continue; } if (rword == RES_IN) { -- 2.25.1