From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 7 Jan 2008 10:50:33 +0000 (+1100)
Subject: Fix check for null initrd and boot args
X-Git-Tag: v1.0.0~965
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=832299e099abcf644fb8a7362a9dd18a6a965871

Fix check for null initrd and boot args

Because the strings are read from the pb socket, we need to check
for an empty string, not a NULL string.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/devices.c b/devices.c
index 3779810..57c037e 100644
--- a/devices.c
+++ b/devices.c
@@ -286,12 +286,12 @@ void pboot_exec_option(void *data)
 
 	kexec_opts[0] = "/usr/sbin/kexec";
 	kexec_opts[1] = "-f";
-	if (opt->initrd_file) {
+	if (opt->initrd_file && *opt->initrd_file) {
 		kexec_opts[nr_opts] = malloc(10 + strlen(opt->initrd_file));
 		sprintf(kexec_opts[nr_opts], "--initrd=%s", opt->initrd_file);
 		nr_opts++;
 	}
-	if (opt->boot_args)  {
+	if (opt->boot_args && *opt->boot_args)  {
 		kexec_opts[nr_opts] = malloc(10 + strlen(opt->boot_args));
 		sprintf(kexec_opts[nr_opts], "--command-line=%s",
 			opt->boot_args);