From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Wed, 27 Jan 2021 08:21:40 -0500 Subject: [PATCH] cmd: pxe_utils: fix ipappend ip config empty vars In-Reply-To: <20210121074435.2754687-1-art@khadas.com> References: <20210121074435.2754687-1-art@khadas.com> Message-ID: <20210127132140.GA7530@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, Jan 21, 2021 at 03:44:35PM +0800, Artem Lapkin wrote: > 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 If Linux is happily parsing this, I'm not sure it's worth changing. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: