From patchwork Sun Feb 28 23:47:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1445370 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KQxSvDlc; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dpg7Q1vxsz9sRR for ; Mon, 1 Mar 2021 10:48:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18E3582047; Mon, 1 Mar 2021 00:47:46 +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="KQxSvDlc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2CA1B81FC1; Mon, 1 Mar 2021 00:47:39 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (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 9E31681FC1 for ; Mon, 1 Mar 2021 00:47:34 +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=seanga2@gmail.com Received: by mail-qt1-x832.google.com with SMTP id o1so6410442qta.13 for ; Sun, 28 Feb 2021 15:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SQuPIa1G/R5KPLSFAD/Ca64bQVyg5nfX/+xYHwCBMZI=; b=KQxSvDlcuExiFAV+gI2PSuLYGmm9IDm/sVOziQFCCasM54XaiOSfHsl4e/6+NmWVZX 4GJUkq07B2u9tiU9JrrfwXf5iMd9zZDJHpxzH3d8X0K6igEk8AUDNoKVabYIvxkj4MPd rP4nvBApqHQe6TxCFQ3qQuRrVUaBlc6c9qW97u9qM8uKAAb41tUp+FoVGz6jV5RW/ng9 D4aCqU+2lMLeTR1ARcgqDorct0ku192bQ7X9/0O5h8jLEk5VFxYiPA8l8hLk+lfy5kV3 T8FhHgKCeOAOPUHxEbS+99gg1BbZsiT+TvahF/PlAj5LiozbecRQWcjlP42PwBlADte6 CRaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SQuPIa1G/R5KPLSFAD/Ca64bQVyg5nfX/+xYHwCBMZI=; b=jLKzpVkeP5XRjmxnx623z/xJyx8XTqy0FNE/eB24qtzMyJk/5Dl1B3iur2WoXgWWxQ Z4jAZIkWesthD2aLpFtuDNaHe3FCc9dW+6bbpBJsxmuckjj519/qNzTul9axj2qbmhFo 6vIHpI5p/V//Sr3I6yxpPvviB3MUZqkD+TUmH42wqzrSynVjZL7UAKHCgVYm3KdqzVcX BxgKpnTaFFmq1Pvayadjk9VkUYWz2T3urtHIsCUctctWx5QNlKoIrKwo+QlXvci23MpD BLxEDMuG9V/6Crgam38J8Jj6Nw1RiF4req2EsO3OtddZsZ/PRdhN2GMqj7WWN4Y2Dn/c 62Ow== X-Gm-Message-State: AOAM531BfWm4e3J0dGGjI+I1UXn/f9TkhJ4KFE/wRANRP3D1pLc1rVRP kCnMJuajao/7LIYo4kH7BBo9n95U3g567A== X-Google-Smtp-Source: ABdhPJwKn2+dchSRKXUEFHAhCsdmRL8gs0S8jTXhinZ1+MVwe30gSNNGE1JaQg7D1Rhh/ScBMBvVrg== X-Received: by 2002:ac8:4e12:: with SMTP id c18mr11737485qtw.384.1614556053418; Sun, 28 Feb 2021 15:47:33 -0800 (PST) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id n136sm7424527qke.123.2021.02.28.15.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 15:47:33 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson , Niel Fourie Subject: [PATCH 5/5] cmd: Convert part uuid to use cmd_result Date: Sun, 28 Feb 2021 18:47:18 -0500 Message-Id: <20210228234718.1208376-6-seanga2@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210228234718.1208376-1-seanga2@gmail.com> References: <20210228234718.1208376-1-seanga2@gmail.com> 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.102.4 at phobos.denx.de X-Virus-Status: Clean This is fairly straightforward. This allows part uuid mmc 0 foo To be rewritten as env set foo $(part uuid mmc 0) or even (if the variable is not required to be environmental) foo=$(part uuid mmc 0) Signed-off-by: Sean Anderson --- cmd/part.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cmd/part.c b/cmd/part.c index 3395c17b89..97e70d79ff 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -19,9 +19,12 @@ #include #include #include +#include #include #include +DECLARE_GLOBAL_DATA_PTR; + enum cmd_part_info { CMD_PART_INFO_START = 0, CMD_PART_INFO_SIZE, @@ -43,12 +46,19 @@ static int do_part_uuid(int argc, char *const argv[]) if (part < 0) return 1; - if (argc > 2) + if (argc > 2) { env_set(argv[2], info.uuid); - else - printf("%s\n", info.uuid); + } else { + size_t result_size = sizeof(info.uuid) + 1; - return 0; + gd->cmd_result = malloc(result_size); + if (!gd->cmd_result) + return CMD_RET_FAILURE; + + snprintf(gd->cmd_result, result_size, "%s\n", info.uuid); + } + + return CMD_RET_SUCCESS; } static int do_part_list(int argc, char *const argv[])