From patchwork Thu Jan 21 07:44:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Art Nikpal X-Patchwork-Id: 1430070 X-Patchwork-Delegate: rfried.dev@gmail.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=DOHJPSIs; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DMCRR516Rz9s1l for ; Fri, 22 Jan 2021 06:40:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EB55182859; Thu, 21 Jan 2021 20:40:15 +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="DOHJPSIs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2D04682757; Thu, 21 Jan 2021 08:44:49 +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,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (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 385E1806C5 for ; Thu, 21 Jan 2021 08:44: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=email2tema@gmail.com Received: by mail-pl1-x62e.google.com with SMTP id d4so823003plh.5 for ; Wed, 20 Jan 2021 23:44:46 -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:mime-version :content-transfer-encoding; bh=TqfDTav3dDBOAsLtJEmGPq2pDM+9FFhk5YmAvdhEmnU=; b=DOHJPSIsEh/6FeVXw9Jpnj7ElcjK8rjcCrLgJBziYkbx6mwGtBmxgmBD3PLcLBskjS XOEXCh3UTa7cdIs+HYngGopC5vmLVyn6VO/ZD0Ikf47F7NLkgVMgojxnb3qfOWrJAo8c UPxgiFrBmmGYKsdJX1utJBX00ZD9iZ8gugdZ7XWvWdA3jNNJjPfftRqmJe4KLXyW25Am 7+fwVaGhXWPoWtvIN/IceWwzQkxbVq8KJ3hz6xOleglV8FF/mkvBg9oU6eRCL8pZaUwd OCtucYmMHJkTg9VD2j0pm4BZaPbTDNrXVhaHwgwoonevRsXAWNjpIkG3uSQTiL+dlPSu 7cLQ== 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:mime-version :content-transfer-encoding; bh=TqfDTav3dDBOAsLtJEmGPq2pDM+9FFhk5YmAvdhEmnU=; b=b+L1iCT5rXGo6vSBpM/mONrTzi5QHXQcZ6cwrhhova2yjskH5OVm6Bbgs7wNj2MMth 8cB6VMa+p/hxgU7yTpyKxQwmyZp5Z+kslJzCI83382zTLxkqz80qgrsOWcHPiDSoGfDg FmQMkpT9LCHkGey3UCQv6g/ez8ciKfoQF3UFlE9BLV+U16FEbV+KzGo77wGuIgZzBaMy dIX5Cpc7rtHA2emJ2J6IuHfYog+gZM0LgAwmi74gfyeLdc0VbO58UZK4XWWZkt65uiNN e/bPIgrDacQdcBLn22XnMfzlcUK6Jey0uxVDVgCkJzZmtidvPPCnIjIIThqOs3zAQk2r Tl9A== X-Gm-Message-State: AOAM530Vrlqq6cORZb4dUuYqzcReoBlvoYXrKELXAL6OKTfi8jo4VWoB 2VuRS2mgxnJ0X9GreEMwXuQ= X-Google-Smtp-Source: ABdhPJxG1IF7BfqF5j33k0IIo6Ql0ivtFbShTK7zPSV08yVZeZlGZSU/8X2TRlzBnXhY+hMuUDBN0Q== X-Received: by 2002:a17:902:8e85:b029:de:23f0:f342 with SMTP id bg5-20020a1709028e85b02900de23f0f342mr13521575plb.69.1611215084616; Wed, 20 Jan 2021 23:44:44 -0800 (PST) Received: from localhost.localdomain (199.19.111.227.16clouds.com. [199.19.111.227]) by smtp.gmail.com with ESMTPSA id a25sm4418746pgv.40.2021.01.20.23.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 23:44:44 -0800 (PST) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: trini@konsulko.com Cc: u-boot@lists.denx.de, u-boot-amlogic@groups.io, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH] cmd: pxe_utils: fix ipappend ip config empty vars Date: Thu, 21 Jan 2021 15:44:35 +0800 Message-Id: <20210121074435.2754687-1-art@khadas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 21 Jan 2021 20:40:13 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean PROBLEM: If ipaddr, serverip, gatewayip or netmask variable undefined we can have for example ip=192.168.2.33::192.168.2.1:255.255.255.0 yes its works same for linux kernel, but im think no need print SUGGESTED SOLUTION: if some variable was undefined we need just print empty place like this ip=192.168.2.33::192.168.2.1:255.255.255.0 Signed-off-by: Artem Lapkin --- cmd/pxe_utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 8716e782..2049c0f3 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -395,9 +395,12 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) } if (label->ipappend & 0x1) { + char *a = env_get("ipaddr"); + char *b = env_get("serverip"); + char *c = env_get("gatewayip"); + char *d = env_get("netmask"); sprintf(ip_str, " ip=%s:%s:%s:%s", - env_get("ipaddr"), env_get("serverip"), - env_get("gatewayip"), env_get("netmask")); + a ? a : "", b ? b : "", c ? c : "", d ? d : ""); } #ifdef CONFIG_CMD_NET