From patchwork Tue Nov 2 07:19:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Art Nikpal X-Patchwork-Id: 1549497 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=BFjL7c2S; dkim-atps=neutral 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=) 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hk1WH5k4xz9sS8 for ; Tue, 2 Nov 2021 18:19:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23FD28352D; Tue, 2 Nov 2021 08:19:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BFjL7c2S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6BF9C835E2; Tue, 2 Nov 2021 08:19:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) (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 7695A8352D for ; Tue, 2 Nov 2021 08:19:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=email2tema@gmail.com Received: by mail-pl1-x62f.google.com with SMTP id n8so3961652plf.4 for ; Tue, 02 Nov 2021 00:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y1oLocf3LQA7vYfRA+ROIdh39qncgv9jSckrQmIoaCQ=; b=BFjL7c2SRtaveBKeZpJXaPLvDQaMBdGxypYhnt+UQ5xZz1VBo4fEAr6X9XGQ4ofD+h P5eHBp04+Lvr50xL/8A6ciya0wjAWUaVkWHWgpgL+N8bs/2gCRbLJjfUkiP4YIIwIQ6U FwxnT94mNzF5BoHPewkAkSGMLGIWEyCHtt5XbVbA5YRnnWrTXChIgMV18tkzCoh0Ve1c 89feq3VNxWJ8gYIKbwHZ6+YOlAVs5mqzh+oCf4CXW/Eb7tVNFQCrQuEsQqXE9pT3BslT ME2CtjKcxfd3pKJiULgh3RfyNa58L+hLeHTVYVQQU1r6oPaCGqLf7zIDDzrV2cY+9MPT ydkA== 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:mime-version :content-transfer-encoding; bh=y1oLocf3LQA7vYfRA+ROIdh39qncgv9jSckrQmIoaCQ=; b=qmJz813ddvrkz9FIb5igtrBv7ZXrLd5HGKi4kSyUR50vtTaEdFyW1jwd8rncd/9QPn hq6yJ454NpfejlYq7V7qP+UVuZY+M5cRB2KlB8wpwHwYm358/3vZytKDl9uq5KxD2jB3 KHa9Hn6BPiNltbelcS1QtDvdJBTBTMPTmYhWQqTloZFVY308eLmjfm2XjOFOWBhTckT3 hhTfVa+a8lqFKazOGIB9E2LHJw1bk5Bt/YrNg2u5jUcTtaqWy88J/EU+Ql1kLCZdl7Sg z7T8aTPTSlhn/4GugSJzufVjG4BgjnxrzrMBGj04HPgZJg0znCE/vcHRpVQ6wIYiOrpw v3fg== X-Gm-Message-State: AOAM533i+z30OTWQkrVJBImkuL2T8Btf2QTTNP0LaympE98hHPxKR/G9 617O466fhSJwX40WPVwu0Ps= X-Google-Smtp-Source: ABdhPJwj3E5BiC2oJn0/83ZulmsKzta7qQXL6K96l3SeVW5Kg0sPKF6dzlK/BIuqXyY/+dCywfcQ1g== X-Received: by 2002:a17:90a:9a8e:: with SMTP id e14mr4522219pjp.231.1635837575751; Tue, 02 Nov 2021 00:19:35 -0700 (PDT) Received: from localhost.localdomain (104.194.74.249.16clouds.com. [104.194.74.249]) by smtp.gmail.com with ESMTPSA id u33sm10213413pfg.0.2021.11.02.00.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 00:19:35 -0700 (PDT) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: sjg@chromium.org Cc: trini@konsulko.com, marek.behun@nic.cz, narmstrong@baylibre.com, twarren@nvidia.com, andre.przywara@arm.com, u-boot@lists.denx.de, u-boot-amlogic@groups.io, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH v1] env: setenv add resolve value option Date: Tue, 2 Nov 2021 15:19:14 +0800 Message-Id: <20211102071914.696963-1-art@khadas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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.103.2 at phobos.denx.de X-Virus-Status: Clean Add possibility setup env variable with additional resolving vars inside value. Usage examples => setenv a hello => setenv b world => setenv c '${a} ${b}' => setenv -r d '${c}! ${a}...' => printenv d d=hello world! hello... /* internal usage example */ env_resolve("d", "${c}! ${a}..."); /* d="hello world! hello..." */ Notes Resolving works only for ${var} "bracket" and didn't workd for "unbracket" $var => setenv -r d '$c! $a...' => printenv d d=$c! $a... Signed-off-by: Artem Lapkin --- cmd/nvedit.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/_exports.h | 1 + include/env.h | 11 +++++++++++ include/exports.h | 1 + 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 3bb6e764c0..6608932dc0 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -229,6 +229,7 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) int i, len; char *name, *value, *s; struct env_entry e, *ep; + bool resolve = 0; debug("Initial value for argc=%d\n", argc); @@ -246,6 +247,9 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) case 'f': /* force */ env_flag |= H_FORCE; break; + case 'r': /* resolve */ + resolve = 1; + break; default: return CMD_RET_USAGE; } @@ -291,6 +295,26 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) if (s != value) *--s = '\0'; + /* + * deep resolve value vars + */ + if (resolve) { + int max_loop = 32; + char value2[CONFIG_SYS_CBSIZE]; + + do { + cli_simple_process_macros(value, value2, CONFIG_SYS_CBSIZE); + if (!strcmp(value, value2)) + break; + value = realloc(value, strlen(value2)); + if (!value) { + printf("## Can't realloc %d bytes\n", len); + return 1; + } + strcpy(value, value2); + } while (max_loop--); + } + e.key = name; e.data = value; hsearch_r(e, ENV_ENTER, &ep, &env_htab, env_flag); @@ -304,6 +328,20 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) return 0; } +int env_resolve(const char *varname, const char *varvalue) +{ + const char * const argv[5] = { "setenv", "-r", varname, varvalue, NULL }; + + /* before import into hashtable */ + if (!(gd->flags & GD_FLG_ENV_READY)) + return 1; + + if (!varvalue || varvalue[0] == '\0') + return _do_env_set(0, 3, (char * const *)argv, H_PROGRAMMATIC); + else + return _do_env_set(0, 4, (char * const *)argv, H_PROGRAMMATIC); +} + int env_set(const char *varname, const char *varvalue) { const char * const argv[4] = { "setenv", varname, varvalue, NULL }; @@ -1371,7 +1409,9 @@ U_BOOT_CMD_COMPLETE( "setenv [-f] name value ...\n" " - [forcibly] set environment variable 'name' to 'value ...'\n" "setenv [-f] name\n" - " - [forcibly] delete environment variable 'name'", + " - [forcibly] delete environment variable 'name'\n" + "setenv [-r] name value ...\n" + " - [resolve] resolve 'value ...' to environment variable\n", var_complete ); diff --git a/include/_exports.h b/include/_exports.h index 8030d70c0b..86bc07f051 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -32,6 +32,7 @@ EXPORT_FUNC(do_reset, int, do_reset, struct cmd_tbl *, int , int , char * const []) EXPORT_FUNC(env_get, char *, env_get, const char*) + EXPORT_FUNC(env_resolve, int, env_resolve, const char *, const char *) EXPORT_FUNC(env_set, int, env_set, const char *, const char *) EXPORT_FUNC(simple_strtoul, unsigned long, simple_strtoul, const char *, char **, unsigned int) diff --git a/include/env.h b/include/env.h index ee5e30d036..c4efc5b7e5 100644 --- a/include/env.h +++ b/include/env.h @@ -133,6 +133,17 @@ int env_get_f(const char *name, char *buf, unsigned int len); */ int env_get_yesno(const char *var); +/** + * env_resolve() - resolve to environment variable + * + * Same as env_set but make deep resolve for variable + * + * @varname: Variable to adjust + * @value: Value to resolve for the variable, or NULL or "" to delete the variable + * @return 0 if OK, 1 on error + */ +int env_resolve(const char *varname, const char *value); + /** * env_set() - set an environment variable * diff --git a/include/exports.h b/include/exports.h index 550cafdc7a..a54b997988 100644 --- a/include/exports.h +++ b/include/exports.h @@ -44,6 +44,7 @@ int vprintf(const char *, va_list); unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base); int strict_strtoul(const char *cp, unsigned int base, unsigned long *res); char *env_get(const char *name); +int env_resolve(const char *varname, const char *value); int env_set(const char *varname, const char *value); long simple_strtol(const char *cp, char **endp, unsigned int base); int strcmp(const char *cs, const char *ct);