mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
33 lines
964 B
Diff
33 lines
964 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 30 Jun 2014 14:16:46 -0400
|
|
Subject: [PATCH] Don't munge raw spaces when we're doing our cmdline escaping
|
|
(#923374)
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/lib/cmdline.c | 11 +----------
|
|
1 file changed, 1 insertion(+), 10 deletions(-)
|
|
|
|
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
|
|
index 0a5b2afb94b..970ea868c14 100644
|
|
--- a/grub-core/lib/cmdline.c
|
|
+++ b/grub-core/lib/cmdline.c
|
|
@@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
|
|
|
|
while (*c)
|
|
{
|
|
- if (*c == ' ')
|
|
- {
|
|
- *buf++ = '\\';
|
|
- *buf++ = 'x';
|
|
- *buf++ = '2';
|
|
- *buf++ = '0';
|
|
- c++;
|
|
- continue;
|
|
- }
|
|
- else if (*c == '\\' && *(c+1) == 'x' &&
|
|
+ if (*c == '\\' && *(c+1) == 'x' &&
|
|
is_hex(*(c+2)) && is_hex(*(c+3)))
|
|
{
|
|
*buf++ = *c++;
|