From patchwork Mon Apr 3 13:50:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1764448 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=PIm4tdMw; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PqsjZ341Yz1yZT for ; Mon, 3 Apr 2023 23:50:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F84685C98; Mon, 3 Apr 2023 15:50:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="PIm4tdMw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B21C385E8E; Mon, 3 Apr 2023 15:50:22 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::628]) (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 439E4859D6 for ; Mon, 3 Apr 2023 15:50:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZJ8EXR/AdzpqTZ62p2umcLTzFtRFRFUsqdNClouISH16QB6CmxkI/PjQrXlrailI2UcAs0eMCTw1g4KPkdvb4qRcNr+TVR4r9pOnZMTULu9CbYOBG4WD2By3kl7R/bpKNs+EWsby7oebvS3hKqGJV4qH98GiLOcv1uJNLyi4e62Yw0q381TfdAQdd5U7mUzGSnvdn/AollNLFAwbXYaLuJfDyPI6FgPsfA5MWRZ2WVaLvAr/ZsobCJ3i8aOEsETUwSi+CDuluUh4NZ9lTUGPHg5M7r/EjmClGjOo5BI1RmHaiwfTyuTZhr9JTtTKlIE6FsnfqYLMRJpzIpsmlLDeyw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6jhlGfopvLVMDMfaFwJ52Lt6LX9oNFGrWpOs6mxXWFU=; b=DEOqPbcTGtFr5IqryV/uksYMZ1nfP3BaiC4dkJ2is4hb0/JLpIxFWXR4eRdDVQTWIUfdp7gWYZDhXg+FZ73Vrud4tfiWBTTDsZSXmxDxVSRQ5ZU4C+EiqVmY/PrHNsu1w0RcEe9BnfShXT5kUnRUVCUm8lzgpJdcFlAALCU7T3idR4MXMJkizo1JGXUrhQZFwkn3qKIl90twl7jla3QcDMjdEs5Ygqej3V3iCBDtv/PqSdrqOOwyMojbEFjQtBKebQg7xddsLsYueuqrXKKCQXfEVnIT3BOe09Lz2KrVbjuBNavsIZvgcGeVJBVEGLRQEoeXa7piI3GMjfNUm2Wt8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6jhlGfopvLVMDMfaFwJ52Lt6LX9oNFGrWpOs6mxXWFU=; b=PIm4tdMwuIdLfnEDTtKvBvitZYlHkIlK5rJ4dp0+7zYJmVRRK9QGKxjWzrddij7pdou1tpksM1tRDUCkD3Lhwnlcisc4IPY2rGPWKUt/k4X+9AfmYGKI2zWkZ1Zh3EpqaWQcV60n0HD0og0LzTrJYr7rkexUy3ALSHldUctSp48= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DU2PR08MB10159.eurprd08.prod.outlook.com (2603:10a6:10:46f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.33; Mon, 3 Apr 2023 13:50:17 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7789:9e19:9554:4717]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7789:9e19:9554:4717%2]) with mapi id 15.20.6254.033; Mon, 3 Apr 2023 13:50:17 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de, Simon Glass Cc: Stefan Herbrechtsmeier , Hector Palacios , Marek Vasut Subject: [PATCH v2 1/2] common: cli_hush: Restore clear local variable support Date: Mon, 3 Apr 2023 15:50:00 +0200 Message-Id: <20230403135001.14573-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR3P281CA0175.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::12) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|DU2PR08MB10159:EE_ X-MS-Office365-Filtering-Correlation-Id: 1351d4d2-89d6-4d2b-8ac3-08db344a5b9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p66R3WK3MXR5o6W93wbIa7WEXoWGn7WrSAUwAnf5uGD8dguiH5BDqWF+16WYNz8ODDcaNrAiHPO9/8LU5wXTFI2pTvnL1g/CY2kJf1CH9a4A8AdahVDzlm11BoxoRdi4ePKwEOax4l90jiBadvxHOrRASMNtL20HRVOhd9KZnhAAKeCmMGZSyJ+0FhBoMW8Bm8BbUwsHIXI15K+cfW9jLDTikBka/v4wzwmAVibnoAXWtHn7SVV0zd+dG4yKO6Sgn87oReDmCGxfttGIH6ztVbZvaNCCtpQHin2m8+njWQ1hUj5gCpOlc0RDGz676J7qppI75xSJ4S3dZ8UlBMq032phtxW83E5C1EVXLK4FNTiIQw0WEBNuP7mxOWzXtfJm+ls1rt5JIKkyFim3juiDsOIvGQ6ssEiLV5/f8x7Q+Ro7zDFz+BNClbpQP02iI71hbDyRpOILALgOoVKD5ml0UorVwzXV3d7b33Znu0rZpMz7+JTQYVAXoa4PybMaKzKD4enpdIcX1kLyo4ChuIXGtAhpKs4Yril4Ca3z+tRkRk1mZUHQNKeuJEOmi4ir+oDdStHO3WDrOC0uHZZoD3y0od5Kb797GNpfj+PRtK8zXqtrpvsTzVdiIY6SHZdTK9s3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(366004)(346002)(39860400002)(376002)(451199021)(5660300002)(86362001)(2616005)(186003)(83380400001)(66574015)(1076003)(6506007)(6512007)(26005)(38350700002)(38100700002)(8936002)(478600001)(54906003)(6486002)(52116002)(4326008)(41300700001)(36756003)(6916009)(66556008)(66476007)(66946007)(8676002)(316002)(6666004)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?SocF7Yto3vTuSt5CoJwr+Qg2fA6t?= =?utf-8?q?qu3P4yBoVUUhCWQKpM0eqb1Fie8AWCeqNIEoguOdiwkML3MLuuAdQ+pXtOJYJOUxW?= =?utf-8?q?d87VUHqamZKavX25F228RcEliLwi+3DE/rEh27j53tKYFG3slpnSmsndUozfGqmog?= =?utf-8?q?lTL8VDvsDH4uOPUBm4x3QB9CzSOZErNsJAy29EH+xcPQzeLlkV4PM1RLP6h/FeLoE?= =?utf-8?q?IRDhgV/QP+L0S/G+wu2xTx0CingjyB/ocjt5mcPtb/y2+WUC6re7hpqdB26nylUff?= =?utf-8?q?ZiT41b+Ae0zuSLpq40Jf3f7fqM2AzderEd4OyvKnWkjK5IC9vGiK8Opee4rrw9Ocd?= =?utf-8?q?bSYXCLGvR5HGpkXeVoQSk+WUGvJplBBfDHCEd/eVDusseQPcQEOOzQOQTtOaaf3Fr?= =?utf-8?q?xEjEs1K3y+H8b7XG1K6bo4RFax1KGnaBwnu2x8FAgcqvjNhKZpgcDENcen2dj/GAm?= =?utf-8?q?YGajuxB0WF93ZRIQfc7A99T2FZvPcaDPeu4c5Vf5P7RyuUUv9fOSLSr4YU61UZYE6?= =?utf-8?q?9X9vpMKvMaixohX/hEQ06mNb5DZYEjsO0XxWFdVuvfsFDONKa1xKV7FjMabfpgNFJ?= =?utf-8?q?ixJ7he5Z9RvA4aVmNBod00Uor+XIlCGCiXGOO3ZPD4uaROwdHYC3CQJXghtpRzgzH?= =?utf-8?q?1qLqUfWgZ11CJaRsA798nJWkPVYNb3C/+YFecL3a/t0H/4SJIyW7PGhSp4e4ft4bl?= =?utf-8?q?XRkNYd1MrkKJMm2k7AONTwTe5cSqaaa+I9/7t+dIQPBF+2qV5kVmZO9qZZHyeLq4p?= =?utf-8?q?Ozrt+8M3yMvNwTayEj5iavkfooo+sT9tJLQb1kPB0agzJ5KokyTi6SXQR7sMfuMgf?= =?utf-8?q?bhEJe5/2zZH6oGH5CK1wYmKGFlk1m6vYxPk8B38seCPoWAiCcZMIEbVmX4bW/lDW9?= =?utf-8?q?4ZGBUWUEFIdYVyaws7omEpix26kfzaN3MQlE7mj+KzXKBSTql48sYBE8uRTswHQcO?= =?utf-8?q?WLAzYOsBVdy1Rd91egZmBGp5tuvFwtz3AnXbCUqCmdI/4P+HMw2XMS/CTsMs41yfR?= =?utf-8?q?hlMJ5VgzOK3cJdEXVb+Z1mRZLHW5D+zW1ToH5H78ePU3RxX9TPJKtBKZe3T/g9k9a?= =?utf-8?q?Kmfg0ZcxeOe1JMYYDrjOp0XsNEh2EtcjsFlbz1GmXyopgRDtNLbPBoIXcgVtyzyEA?= =?utf-8?q?bxmo2ZTgzKZGPllW/IN5dyrJ1lfpRAkRkOaOTtjBzpmWUWTwii5MNskg7GxmdKdnA?= =?utf-8?q?DrbcWBkk9AAij9fu2Ptem06K84GhugYinWL2NV/eBYBn/kO+rf/iq0ayJuZQdSdOg?= =?utf-8?q?Ryownul2I6NQz3oH+ifq5aDq1NJOtGepbhrFpiQqfcfXUCYqoXt6HEzhf5y5c7p2c?= =?utf-8?q?pJOQm6PGBsOC9rlQAyI7QuLeWwTwiZvq02Yk7IYqyNQA7RozJVEAYaR+TCBVQdBxH?= =?utf-8?q?CFBn8WiaP57LoX8WPzDE2k5+lZA6RVwVKfv0cFEBhUj4vPf9hllnxARQP7BTTLMEW?= =?utf-8?q?qpVqBjN0Ti+WgHtLEUwPxuqYwlH7LmOV+oxhgFatDEHyRXOklWTVI3XfvSaiRkZK4?= =?utf-8?q?6ebCITtYiLX0koQk4Gz8h8WGKhfoudE3QQ=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1351d4d2-89d6-4d2b-8ac3-08db344a5b9b X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2023 13:50:17.3969 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: r5NRKmnI+YzxbFEzTevOYom/irV9r7Te8clcF9LyOcxRbt/NG+6fAs1ohZxGGSXcj+erc9ENADQMhurNCltkig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB10159 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 From: Stefan Herbrechtsmeier The u-boot hush shell doesn’t support the unset command to clear a variable and therefore an empty value ("c=") should be a valid value for the set_local_var function to clear the variable. This partial reverts commit aa722529635c ("common: cli_hush: avoid dead code") and only checks for a `=` in the string. Additionally explicit call the unset_local_var function to remove the variable if the value is empty. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass --- Changes in v2: - Use `!var` instead of `var == NULL` common/cli_hush.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/common/cli_hush.c b/common/cli_hush.c index 1ad7a509df..171069f5f4 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -2171,12 +2171,18 @@ int set_local_var(const char *s, int flg_export) * NAME=VALUE format. So the first order of business is to * split 's' on the '=' into 'name' and 'value' */ value = strchr(name, '='); - if (value == NULL || *(value + 1) == 0) { + if (!value) { free(name); return -1; } *value++ = 0; + if (!*value) { + unset_local_var(name); + free(name); + return 0; + } + for(cur = top_vars; cur; cur = cur->next) { if(strcmp(cur->name, name)==0) break;