mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
36 lines
984 B
Diff
36 lines
984 B
Diff
From ff25c6034ab8213d911414e666b7d44bc44496aa 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 108/206] 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++;
|
|
--
|
|
2.15.0
|
|
|