From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 7 Mar 2011 02:44:24 +0000 (+0000)
Subject: [image] Clear the command line rather than setting an empty command line
X-Git-Tag: v1.20.1~2270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dd23e1ee9b5d0c7a233e9f8e3dba3eef9b793bc;p=thirdparty%2Fipxe.git

[image] Clear the command line rather than setting an empty command line

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c
index 9b3895a9f..7001087b6 100644
--- a/src/hci/commands/image_cmd.c
+++ b/src/hci/commands/image_cmd.c
@@ -45,13 +45,16 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 static int imgfill_cmdline ( struct image *image, unsigned int nargs, 
 			     char **args ) {
-	size_t len;
+	size_t len = 0;
 	unsigned int i;
 
+	/* Clear command line if no arguments given */
+	if ( ! nargs )
+		return image_set_cmdline ( image, NULL );
+
 	/* Determine total length of command line */
-	len = 1; /* NUL */
 	for ( i = 0 ; i < nargs ; i++ )
-		len += ( 1 /* possible space */ + strlen ( args[i] ) );
+		len += ( strlen ( args[i] ) + 1 /* space or NUL */ );
 
 	{
 		char buf[len];