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 6583DC433F5 for ; Sun, 6 Feb 2022 18:40:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B29B183C48; Sun, 6 Feb 2022 19:38:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (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="oECoNIZT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 03A8783C00; Sun, 6 Feb 2022 19:38:23 +0100 (CET) Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (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 6CCFF83C07 for ; Sun, 6 Feb 2022 19:37:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (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-x336.google.com with SMTP id l123-20020a1c2581000000b0037b9d960079so4262195wml.0 for ; Sun, 06 Feb 2022 10:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9BMDm0hSkm2THf4Da7uJtxVmCspuLb8Tnoj9QNfwuTk=; b=oECoNIZTjRBlhS+i076nTcIRJWli049GSSDDvtYHUULn2MO1GeFYbWfERKJXmrJFrG vTFw1Wjuaoa8HvSuSFtngMZeONHgJJL0dHH6y4pQJzkS/QNFem/a/A35m1KuX+vkwBcc HZ29XgYFUbPs8FSeJr25FGxLpU39IfgkbxLsM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9BMDm0hSkm2THf4Da7uJtxVmCspuLb8Tnoj9QNfwuTk=; b=AA7PjLd2Qmc3Vh0RR+NE9pbOQ79YAd5kKIB5kg8Ccvn523lDvciiYqox/LvWLJpISY +WKlHi0dPuemU7gz9ygYfbNGgoa5jAEoj5wT+ib50bDdQHvfQ8Qc58mvVwPsOL0uZLrE cpq0P9FaLNZwGIizZHcDaUyh8PyN/EVIsbyF2SUD/K2ahlw9hI5gK1Z4/9qyS2lw4xNs rC+6eaU/OyELX+b0b3D3+e6lRa6lphe6NWc5KWaNJ5jUYqXE1K8iudKPtYdWIG/AlB5j 431nwQuQ1Lm1gwjeuLGQc8JakRCMnguMQ4fJPjh0z54AHJFVBRZKTqyTGv0fltDaoxDt cVtg== X-Gm-Message-State: AOAM530Qal8UTis6BWEEnTWbj2t/ZwQ70do5xzHG3dXiEkSN0i+eeXp4 Ad7SclWXciDylATkqDtQ4aapkqT7K2d5TQ== X-Google-Smtp-Source: ABdhPJwnMjI7VfQX9hWLiT3UPXsYnBVPJfYp5AwkruJmGclErLLcORFYp49XCmdLZK1aScuZTbcauQ== X-Received: by 2002:a05:600c:2251:: with SMTP id a17mr6530532wmm.166.1644172669037; Sun, 06 Feb 2022 10:37:49 -0800 (PST) Received: from pwmachine.home ([2a01:cb14:983:1f00:e5b3:218b:cb92:2549]) by smtp.gmail.com with ESMTPSA id ay29sm7095011wmb.38.2022.02.06.10.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 10:37:48 -0800 (PST) From: Francis Laniel To: u-boot@lists.denx.de Cc: Marek Behun , Michael Nazzareno Trimarchi , Simon Glass , Wolfgang Denk , Harald Seiler , Francis Laniel Subject: [RFC PATCH v2 13/21] cli: hush_2021: Add functions to be called from run_command() Date: Sun, 6 Feb 2022 19:37:09 +0100 Message-Id: <20220206183717.57446-14-francis.laniel@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206183717.57446-1-francis.laniel@amarulasolutions.com> References: <20220206183717.57446-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.5 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 51e351cdc6..f2619eb49a 100644 --- a/common/cli_hush_upstream.c +++ b/common/cli_hush_upstream.c @@ -1007,6 +1007,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__ @@ -2994,7 +2995,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. */ @@ -3153,7 +3171,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)); @@ -3161,7 +3178,6 @@ static void setup_string_in_str(struct in_str *i, const char *s) i->p = s; } -#endif /* !__U_BOOT__ */ /* * o_string support @@ -7875,7 +7891,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 $?": @@ -7884,7 +7904,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 @@ -7921,21 +7945,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.25.1