efibootmgr: print space before optional entry data

Before: $ efibootmgr -u […] Boot0004* Arch Linux HD(1,GPT,[…],0x800,0x145000)/\vmlinuz-linuxroot=LABEL=Arch rw nowatchdog initrd=\initramfs-linux.img After: $ efibootmgr -u […] Boot0004* Arch Linux HD(1,GPT,[…],0x800,0x145000)/\vmlinuz-linux root=LABEL=Arch rw nowatchdog initrd=\initramfs-linux.img Note the extra space before "root=". Signed-off-by: Carlo Teubner <[email protected]>
rhboot · May 25, 2024 · b61c061 · b61c061
1 parent 0a85e9b
commit b61c061
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
@@ -1035,7 +1035,7 @@ show_var_path(efi_load_option *load_option, size_t boot_data_size)
 			warning("Could not parse optional data");
 			return;
 		}
-		text_path = calloc(1, sizeof(" File(.")
+		text_path = calloc(1, sizeof("File(.")
 				      + strlen(a)
 				      + strlen(")"));
 		if (!text_path) {
@@ -1045,7 +1045,7 @@ show_var_path(efi_load_option *load_option, size_t boot_data_size)
 		}
 		char *b;
 
-		b = stpcpy(text_path, " File(.");
+		b = stpcpy(text_path, "File(.");
 		b = stpcpy(b, a);
 		stpcpy(b, ")");
 		free(a);
@@ -1083,6 +1083,8 @@ show_var_path(efi_load_option *load_option, size_t boot_data_size)
 			return;
 		}
 	}
+	if (strlen(text_path) > 0)
+		printf(" ");
 	printf("%s", text_path);
 	free(text_path);
 	printf("\n");