From: Glenn Washburn <development@efficientek.com>
Date: Fri, 26 Aug 2022 00:53:51 +0000 (-0500)
Subject: kern/corecmd: Quote variable values when displayed by the set command
X-Git-Tag: grub-2.12-rc1~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42a424c9d50fdab03c5a2a7660096b239f127ba8;p=thirdparty%2Fgrub.git

kern/corecmd: Quote variable values when displayed by the set command

Variable values may contain spaces at the end or newlines. However, when
displayed without quotes this is not obvious and can lead to confusion as
to the actual contents of variables. Also for some variables grub_env_get()
returns a NULL pointer instead of a pointer to an empty string and
previously would be printed as "var=(null)". Now such variables will be
displayed as "var=''".

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/grub-core/kern/corecmd.c b/grub-core/kern/corecmd.c
index fc54f43f2..62d434ba9 100644
--- a/grub-core/kern/corecmd.c
+++ b/grub-core/kern/corecmd.c
@@ -40,7 +40,10 @@ grub_core_cmd_set (struct grub_command *cmd __attribute__ ((unused)),
     {
       struct grub_env_var *env;
       FOR_SORTED_ENV (env)
-	grub_printf ("%s=%s\n", env->name, grub_env_get (env->name));
+	{
+	  val = (char *) grub_env_get (env->name);
+	  grub_printf ("%s='%s'\n", env->name, val == NULL ? "" : val);
+	}
       return 0;
     }