From patchwork Fri Mar 31 14:43:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1763805 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=IKKLjpjw; 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 4Pp32p18ZXz1yYb for ; Sat, 1 Apr 2023 01:44:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4B2E485B59; Fri, 31 Mar 2023 16:44:03 +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="IKKLjpjw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A01CB85B0A; Fri, 31 Mar 2023 16:43:59 +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=unavailable autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20604.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::604]) (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 856A085E80 for ; Fri, 31 Mar 2023 16:43:55 +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=B+wxjtctm4iZsCAD47sQAx9lA3Rt26ojWttBhX9lgko6pBJDqhWG6Z1C8ZhpJsCzU49LTVV0H7raozqHBgjuXih+h+E6YD9OCqbniHZdfUIVDVJDzduecrUccLLecdTtmQM2jGzZnN6H8smcNUKOECIdv2dwoMFJwmRrr8HiZwq2xZnUin3PBXgu0GMIjK2PQGAJSPWGxScJRUsd8x57WcmeQI3IE6xqhADkI9q2tc9Gakz4off32FACI5kHHRlsEx6LnCeJIz+ud/D5iLdS5HlLvHqlpozTu8nNBs+6c8rVJoK6CaAQktFFOTj4EEf7u0kCmC2CXdcZ3ry/w15BXQ== 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=guKwq2u+15YgkhR63WOGdnaAI+FRYdcDn9L7RCuzZTA=; b=cu/3olFWujMnCDWxpCkTH/l9nVSU4yeARZ1rO2nqYQcoUVc2w1SSbHwzVeCZ6Y8H31BHjPLGaw1R8z5pN3EDOvsE6kONYooBOUmxndATnuhzQl7GMwuj7wsgCnpw2EjYPCdjqsdvZjkpRBKFRTd8iMJInDpweDVVyTnw432mzhsj481SmXCotwkbJHH+QoyKqsoLcvvhvNvZ9jvuVyOD1z9eKcITKMDuMJ0AfTLbhg1w6c9+tPqGBMMGMu6EGdHVml+YqZggMVWsvCp9CPZkGaiZB3/reozTWstGVvnEiY42OvLTcJFTEkMg3V9Whfj1DUjn7nZFhltx59hfGcCE4w== 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=guKwq2u+15YgkhR63WOGdnaAI+FRYdcDn9L7RCuzZTA=; b=IKKLjpjwHsasG/TCEQ0lpbNxyFwLS3Y4HLgMnSWx4DEfNR9tqirwofissxpCQT7f0PH9gccxnoWEmjdiMlgKllN+1TuFdxYvcGL/+mFw65x4m8gm3xxCZuLBuvk6uKhf1b3Rw7LcoGz5tpm9kGfwNOGeZC+QrL32JygslgQqwbQ= 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 DU0PR08MB8277.eurprd08.prod.outlook.com (2603:10a6:10:40f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.35; Fri, 31 Mar 2023 14:43:53 +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.023; Fri, 31 Mar 2023 14:43:53 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de, Simon Glass Cc: Stefan Herbrechtsmeier , Hector Palacios , Marek Vasut Subject: [PATCH] common: cli_hush: Restore clear local variable support Date: Fri, 31 Mar 2023 16:43:28 +0200 Message-Id: <20230331144328.30030-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR0P281CA0057.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::14) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|DU0PR08MB8277:EE_ X-MS-Office365-Filtering-Correlation-Id: 8fba16f0-2713-488c-1d7a-08db31f65967 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0OSguBHhJRGPpB9u7M6YnsA0CTv0GG2lWVZXL0ayb0S0wEfyx+d2dKHRuMt1dyvBcpSqyWEaU53Z+50ivaKsjpcPwalAbsUf7aA0Cts9w9rT5pRN0Yq7Ks1IZNNyeXpe+PqITKWyAX+SyQsOJ3iQspCIRRtN4vseE9XNsUw492qK3qCrKIsz8xFWzE607+YelwH2d4aSeZAiJAaiS+dYUUz3nJ576umlISAhbEQZT9PLkEteW/z6a7fjI2cJX1povfSAb+XK7mAsvws4jyEdc9w4qvS5WJqhajWa0sD5XBE6fHPojTbi8STnb1R0EtRLfYKvoo1IlJy54h4h8jGjCMsz8421+1+cP14KZoZCy+yDtlzGrYEH4TcI5pqLAPGspNOheDA9V01vUt1HVgJQYJ+h713XJS8k2nBdlqyMgfnH+FoItaDQoSCSAN5j8zl/YR8bpLi9uGp70Znk6PETVq9df+dBE1p+fmCPWuwCgaFK8oaRIVBqqJB/qd9enqgQq++tmtMqNGUj/AaKMEsRT2iHF3lZZXSjXvKczHDmkzE0BDj1NptC3xDbFRNqSVSQANzT1tAbOr5KA3nc8rhAAzHXl5qbyUK0DrP3ux+gAqc0duRur2Jw1sw8zOO6Zrvl 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)(366004)(376002)(136003)(39860400002)(396003)(346002)(451199021)(83380400001)(86362001)(316002)(6666004)(52116002)(41300700001)(66476007)(6916009)(4326008)(6486002)(66946007)(54906003)(66556008)(36756003)(478600001)(66574015)(26005)(2906002)(8936002)(8676002)(6506007)(2616005)(5660300002)(6512007)(1076003)(186003)(38350700002)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?VcrnJD9NC3uo5ufE7TstvbdIJCNz?= =?utf-8?q?15vjfkKb/L8Yjc9+6hQzLJFRYRJd77SHbQnjrtJannoW8OWn7Oi7hDPTOfRYzVHlG?= =?utf-8?q?fOTt+CVNyAQS5PIQzyk7FGzmET7vuMXtgKWsyz72AUuY7vf+ftsbL2mJ+9b1amnLp?= =?utf-8?q?4JYNxLmFK3Oob1f5v8LhRAWB1cYNNCCFINk6kSmu+QMkFpM6CaQ1d8C6DjSA393MN?= =?utf-8?q?SUtC/J4x1gYpLpEPQJLKNSptxF5dQB12zaVWsc2GnyXpkySrHGSvhJIE8IBHV86lq?= =?utf-8?q?LAZsFRYSzItcv5rnWqfCzObm8Q6JssRQmZWL2mMayeQ/cDXRBwOaOv9Zysc2qbGlc?= =?utf-8?q?+BBUWOoum7hmADwpD9OfDtJVL7t6IlmU6PVpFDvyeDpE2TjLTwESMkxig702LRStm?= =?utf-8?q?0mRXmM4/Sr54eDLk62clXgSQjEtj29GdBkXd5D26HiIhTPjquDRJPTCVnTnhLrepi?= =?utf-8?q?WWSrOxvmVcPW+dREBuFcayAh1GIwUCZYoFnWyQgUdvRLSOluD0aJHtiJx5yQfwLY1?= =?utf-8?q?hKwc3PiYyPL6eofF3uXJ+VPRxAfDScMIp29hI0NrFKviCELRPi/OwVQDOETiT2iDL?= =?utf-8?q?+8kaHSO1v6uj7H0AdjN9tNPIrr3BaihdQrDVupHODqVMDkwYlfuRiUgXqDzGL+RL1?= =?utf-8?q?13ms+JxGujVB85zUaY6kZWa8ZTJba3J+0vrwN0RYkTfnWeI1w3J4OsXrjkRMlvRXB?= =?utf-8?q?qd+6772xGTzZaUusgBqYagOKan0WPhrq12AfKK7mMDtyVg20dw52x6kXMpj0cD2Fd?= =?utf-8?q?65ALYO+FaD2kwaVDUKlkFDLHdC0sHWu8Du2DKE2w3wAY8v3AWPCIQtwbZtPzKAloR?= =?utf-8?q?svcI6qge5ArTqgNsY8fI4YU9a1sJwuhdNu3GQ0Mg8K261l7TqUT/w/qFAStcudHdF?= =?utf-8?q?Drr7ootoSZaI1YmA0uT+hu7qR0CC5VwJsdm0s/Gu87AL4M+tSCMMkTslQDHesbtyS?= =?utf-8?q?yhQhxLBoGDG/55NCi1msgC6cQxvUQ2cODK6LBjdrDNhGu4nsBt56Kbaf4XpbLGVyJ?= =?utf-8?q?c4oMIzJ27q5QtjjovjO3ZsxNtvEOF30UP7iuXLTrrVgeuRp8L7YNDJ3Qm1uL7Vl4z?= =?utf-8?q?J8t6eOEOR3f+QEk42QgEeRG7e8ynb+m2YHKupELtsji+spFepW3d+hGbR6f93DVwT?= =?utf-8?q?KO49p8+Mn4kOcg9CVGvOzkj9wSLgkxkwgqvOozD++DfLTPmDlvKKFfdoNtovSZeZm?= =?utf-8?q?m0p7zbSQGMI7NVtoR5YDSwEIt3103ql1Hjp3ErgtQAM6/QA1fhU699GonWgR8fopy?= =?utf-8?q?cK78jioq3RAwqBfyBAXElfsCK0JEtLCPkixlD6OL0T5PxWmVYPzZmyp3a0IevKwbP?= =?utf-8?q?qGFKNa4Fz9Ascpe4CRAz57hw8a66xaGEvmaAlrp74JPoqgz/h734dM3oI2Ix8NPBb?= =?utf-8?q?W4TeFB/En7ah+fTaADdjPFLyY+M4l6dTLA0hwr2Ol5gfU9DE/ABDXWBQpLLv3izDs?= =?utf-8?q?G8E7KqyaV047VvhqRtH4mOv5W27xpt3ZX66kiFcrGB57txSV+jdUnKX2SlZ9DoJfF?= =?utf-8?q?OgQgEcaEUuSnzrb4wMAVJb41PVUsBUxyvw=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fba16f0-2713-488c-1d7a-08db31f65967 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 14:43:53.6411 (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: 1ShNbrFGJuluRgVBCyua0YMkjIP0uFzXznY/C3WLLJXqBVjNnboVz8flASjkS8oPv+hEfIqUJRMBfzQ1iMNk3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8277 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 --- 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..c3f7dd12a0 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 == NULL) { free(name); return -1; } *value++ = 0; + if (*value == 0) { + unset_local_var(name); + free(name); + return 0; + } + for(cur = top_vars; cur; cur = cur->next) { if(strcmp(cur->name, name)==0) break;