dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch

4fe85b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4fe85b
From: Hans de Goede <hdegoede@redhat.com>
4fe85b
Date: Mon, 30 Jun 2014 14:16:46 -0400
4fe85b
Subject: [PATCH] Don't munge raw spaces when we're doing our cmdline escaping
4fe85b
 (#923374)
4fe85b
4fe85b
Signed-off-by: Peter Jones <pjones@redhat.com>
4fe85b
---
4fe85b
 grub-core/lib/cmdline.c | 11 +----------
4fe85b
 1 file changed, 1 insertion(+), 10 deletions(-)
4fe85b
4fe85b
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
4fe85b
index 0a5b2afb94b..970ea868c14 100644
4fe85b
--- a/grub-core/lib/cmdline.c
4fe85b
+++ b/grub-core/lib/cmdline.c
4fe85b
@@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
4fe85b
 
4fe85b
       while (*c)
4fe85b
 	{
4fe85b
-	  if (*c == ' ')
4fe85b
-	    {
4fe85b
-	      *buf++ = '\\';
4fe85b
-	      *buf++ = 'x';
4fe85b
-	      *buf++ = '2';
4fe85b
-	      *buf++ = '0';
4fe85b
-	      c++;
4fe85b
-	      continue;
4fe85b
-	    }
4fe85b
-	  else if (*c == '\\' && *(c+1) == 'x' &&
4fe85b
+	  if (*c == '\\' && *(c+1) == 'x' &&
4fe85b
 		   is_hex(*(c+2)) && is_hex(*(c+3)))
4fe85b
 	    {
4fe85b
 	      *buf++ = *c++;