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 668F1C77B7C for ; Fri, 12 May 2023 20:07:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6CAE686362; Fri, 12 May 2023 22:07:16 +0200 (CEST) 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="a2yaFmTz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22F2A8632A; Fri, 12 May 2023 22:07:12 +0200 (CEST) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 9E71686351 for ; Fri, 12 May 2023 22:07:04 +0200 (CEST) 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-x335.google.com with SMTP id 5b1f17b1804b1-3f315712406so334322415e9.0 for ; Fri, 12 May 2023 13:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1683922014; x=1686514014; 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=t2gC2uc8mcXuH+rcxRmhrCiahKWth0TENLQZSncOpBI=; b=a2yaFmTzYgP1YdMaD5dAuToGPr3WUnbR0VPfs4CVEJc5GwDobN98loHfRco//MKfNJ T1Aa4VBLSPZBvQObhliDXG28n+4eXPtoo1l4MasOAcOlWyPGqvhxOwwLe23RyX16N9hH v0dgcHToUFzw6b641F9SMK1A13ebea3kvxLnM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683922014; x=1686514014; 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=t2gC2uc8mcXuH+rcxRmhrCiahKWth0TENLQZSncOpBI=; b=Keqw7AQuDQ7p2H00YU+WHo0HmYgiQ4p7wy2ktwvmtZ5DjEJcrvBFsthBmGBW6M8i0A IHfGfAdFsEsDqnnHS7+2UnD96TBa4nd7THGfmeCQYwxzguJITPoHvF8qA9ehn3EfTabm IDaDtg58cWBneFiOFOzFZlHV5PUDGZUfMZF2gZUgRQvPnnXRi6R7MoNaQKBPgl8v9s9g nBgeOcf4+hUQtOFoYZMmGe4narAG2xaI3hQlE4gDyA98Cp6bmesltlDZ+KhssAqNMJVw Yef9NqDuw5gVc7oo8xvhMVdVZqxoRUQ5/XNMxkcW6Rzml3kb8CLpKmpL9b65ugeZ/JiS TkXw== X-Gm-Message-State: AC+VfDywNojwLYKzT1nj9U1OKjfv7ka4VkWmco2njh5zMnIZ3xVMc3j7 VOT5Na4+75LEnO8BzRNYgB4b1r3lQAaj/DqeptI= X-Google-Smtp-Source: ACHHUZ4j2C0Q2Gd4YojNnghgCPbEcfeLcl/c4zIvrjuG5egJtLRm3OiAiEZpuh4GuQetmlAlPgPjqQ== X-Received: by 2002:adf:ff8c:0:b0:2f8:33bd:a170 with SMTP id j12-20020adfff8c000000b002f833bda170mr22897887wrr.32.1683922014402; Fri, 12 May 2023 13:06:54 -0700 (PDT) Received: from pwmachine.numericable.fr ([213.94.16.214]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003f33f8f0a05sm29565859wmi.9.2023.05.12.13.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 13:06:53 -0700 (PDT) From: Francis Laniel To: u-boot@lists.denx.de Cc: Michael Nazzareno Trimarchi , Tom Rini , Simon Glass , Harald Seiler , Francis Laniel Subject: [RFC PATCH v8 14/23] cli: hush_2021: Add functions to be called from run_command() Date: Fri, 12 May 2023 21:03:22 +0100 Message-Id: <20230512200331.51457-15-francis.laniel@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230512200331.51457-1-francis.laniel@amarulasolutions.com> References: <20230512200331.51457-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.8 at phobos.denx.de X-Virus-Status: Clean run_command() is called internally by the command run and it can also be called directly from U-Boot code, e.g. to do unit tests. This commit adds this path to go to hush 2021. Signed-off-by: Francis Laniel Reviewed-by: Simon Glass --- common/cli_hush_upstream.c | 66 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/common/cli_hush_upstream.c b/common/cli_hush_upstream.c index b806c5c653..b11445c3ac 100644 --- a/common/cli_hush_upstream.c +++ b/common/cli_hush_upstream.c @@ -1012,6 +1012,7 @@ struct globals { #ifdef __U_BOOT__ int flag_repeat; int do_repeat; + int run_command_flags; #endif /* __U_BOOT__ */ char *ifs_whitespace; /* = G.ifs or malloced */ #ifndef __U_BOOT__ @@ -3005,7 +3006,24 @@ static int i_getch(struct in_str *i) if (i->p && *i->p != '\0') { ch = (unsigned char)*i->p++; goto out; +#ifndef __U_BOOT__ } +#else /* __U_BOOT__ */ + /* + * There are two ways for command to be called: + * 1. The first one is when they are typed by the user. + * 2. The second one is through run_command() (NOTE command run + * internally calls run_command()). + * + * In the second case, we do not get input from the user, so once we + * get a '\0', it means we need to stop. + * NOTE G.run_command_flags is only set on run_command call stack, so + * we use this to know if we come from user input or run_command(). + */ + } else if (i->p && *i->p == '\0' && G.run_command_flags){ + return EOF; + } +#endif /* __U_BOOT__ */ #endif #ifndef __U_BOOT__ /* peek_buf[] is an int array, not char. Can contain EOF. */ @@ -3164,7 +3182,6 @@ static void setup_file_in_str(struct in_str *i) #endif /* !__U_BOOT__ */ } -#ifndef __U_BOOT__ static void setup_string_in_str(struct in_str *i, const char *s) { memset(i, 0, sizeof(*i)); @@ -3172,7 +3189,6 @@ static void setup_string_in_str(struct in_str *i, const char *s) i->p = s; } -#endif /* !__U_BOOT__ */ /* * o_string support @@ -7911,7 +7927,11 @@ static int run_and_free_list(struct pipe *pi); * NUL: parse all, execute, return * ';': parse till ';' or newline, execute, repeat till EOF */ +#ifndef __U_BOOT__ static void parse_and_run_stream(struct in_str *inp, int end_trigger) +#else /* __U_BOOT__ */ +static int parse_and_run_stream(struct in_str *inp, int end_trigger) +#endif /* __U_BOOT__ */ { /* Why we need empty flag? * An obscure corner case "false; ``; echo $?": @@ -7920,7 +7940,11 @@ static void parse_and_run_stream(struct in_str *inp, int end_trigger) * this breaks "false; echo `echo $?`" case. */ bool empty = 1; +#ifndef __U_BOOT__ while (1) { +#else /* __U_BOOT__ */ + do { +#endif /* __U_BOOT__ */ struct pipe *pipe_list; #if ENABLE_HUSH_INTERACTIVE @@ -7967,21 +7991,57 @@ static void parse_and_run_stream(struct in_str *inp, int end_trigger) empty = 0; if (G_flag_return_in_progress == 1) break; +#ifndef __U_BOOT__ } +#else /* __U_BOOT__ */ + /* + * This do/while is needed by run_command to avoid looping on a command + * with syntax error. + */ + } while (!(G.run_command_flags & FLAG_EXIT_FROM_LOOP)); + + return G.last_exitcode; +#endif /* __U_BOOT__ */ } #ifndef __U_BOOT__ static void parse_and_run_string(const char *s) +#else /* __U_BOOT__ */ +static int parse_and_run_string(const char *s) +#endif /* __U_BOOT__ */ { struct in_str input; //IF_HUSH_LINENO_VAR(unsigned sv = G.parse_lineno;) setup_string_in_str(&input, s); +#ifndef __U_BOOT__ parse_and_run_stream(&input, '\0'); +#else /* __U_BOOT__ */ + return parse_and_run_stream(&input, '\0'); +#endif /* __U_BOOT__ */ //IF_HUSH_LINENO_VAR(G.parse_lineno = sv;) } -#endif /* !__U_BOOT__ */ +#ifdef __U_BOOT__ +int parse_string_outer(const char *cmd, int flags) +{ + int ret; + int old_flags; + + /* + * Keep old values of run_command to be able to restore them once + * command was executed. + */ + old_flags = G.run_command_flags; + G.run_command_flags = flags; + + ret = parse_and_run_string(cmd); + + G.run_command_flags = old_flags; + + return ret; +} +#endif /* __U_BOOT__ */ #ifndef __U_BOOT__ static void parse_and_run_file(HFILE *fp) #else /* __U_BOOT__ */ -- 2.34.1