mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
179 lines
4.5 KiB
Diff
179 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 1 Oct 2012 13:24:37 -0400
|
|
Subject: [PATCH] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested.
|
|
|
|
---
|
|
grub-core/commands/wildcard.c | 16 +++++++++++++++-
|
|
grub-core/lib/cmdline.c | 34 ++++++++++++++++++++++++++++++++--
|
|
grub-core/script/execute.c | 43 +++++++++++++++++++++++++++++++++++++------
|
|
3 files changed, 84 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
|
|
index 4a106ca040b..560d437cdc6 100644
|
|
--- a/grub-core/commands/wildcard.c
|
|
+++ b/grub-core/commands/wildcard.c
|
|
@@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename)
|
|
return ctx.found;
|
|
}
|
|
|
|
+static int
|
|
+is_hex(char c)
|
|
+{
|
|
+ return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
|
|
+}
|
|
+
|
|
static void
|
|
unescape (char *out, const char *in, const char *end)
|
|
{
|
|
@@ -470,7 +476,15 @@ unescape (char *out, const char *in, const char *end)
|
|
|
|
for (optr = out, iptr = in; iptr < end;)
|
|
{
|
|
- if (*iptr == '\\' && iptr + 1 < end)
|
|
+ if (*iptr == '\\' && iptr + 3 < end && iptr[1] == 'x' && is_hex(iptr[2]) && is_hex(iptr[3]))
|
|
+ {
|
|
+ *optr++ = *iptr++;
|
|
+ *optr++ = *iptr++;
|
|
+ *optr++ = *iptr++;
|
|
+ *optr++ = *iptr++;
|
|
+ continue;
|
|
+ }
|
|
+ else if (*iptr == '\\' && iptr + 1 < end)
|
|
{
|
|
*optr++ = iptr[1];
|
|
iptr += 2;
|
|
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
|
|
index ed0b149dca5..e0fb0a9e48a 100644
|
|
--- a/grub-core/lib/cmdline.c
|
|
+++ b/grub-core/lib/cmdline.c
|
|
@@ -20,6 +20,12 @@
|
|
#include <grub/lib/cmdline.h>
|
|
#include <grub/misc.h>
|
|
|
|
+static int
|
|
+is_hex(char c)
|
|
+{
|
|
+ return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
|
|
+}
|
|
+
|
|
static unsigned int check_arg (char *c, int *has_space)
|
|
{
|
|
int space = 0;
|
|
@@ -27,7 +33,13 @@ static unsigned int check_arg (char *c, int *has_space)
|
|
|
|
while (*c)
|
|
{
|
|
- if (*c == '\\' || *c == '\'' || *c == '"')
|
|
+ if (*c == '\\' && *(c+1) == 'x' && is_hex(*(c+2)) && is_hex(*(c+3)))
|
|
+ {
|
|
+ size += 4;
|
|
+ c += 4;
|
|
+ continue;
|
|
+ }
|
|
+ else if (*c == '\\' || *c == '\'' || *c == '"')
|
|
size++;
|
|
else if (*c == ' ')
|
|
space = 1;
|
|
@@ -86,7 +98,25 @@ grub_create_loader_cmdline (int argc, char *argv[], char *buf,
|
|
|
|
while (*c)
|
|
{
|
|
- if (*c == '\\' || *c == '\'' || *c == '"')
|
|
+ if (*c == ' ')
|
|
+ {
|
|
+ *buf++ = '\\';
|
|
+ *buf++ = 'x';
|
|
+ *buf++ = '2';
|
|
+ *buf++ = '0';
|
|
+ c++;
|
|
+ continue;
|
|
+ }
|
|
+ else if (*c == '\\' && *(c+1) == 'x' &&
|
|
+ is_hex(*(c+2)) && is_hex(*(c+3)))
|
|
+ {
|
|
+ *buf++ = *c++;
|
|
+ *buf++ = *c++;
|
|
+ *buf++ = *c++;
|
|
+ *buf++ = *c++;
|
|
+ continue;
|
|
+ }
|
|
+ else if (*c == '\\' || *c == '\'' || *c == '"')
|
|
*buf++ = '\\';
|
|
|
|
*buf++ = *c;
|
|
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
|
|
index 0d05d6b0709..ba38b5e8aef 100644
|
|
--- a/grub-core/script/execute.c
|
|
+++ b/grub-core/script/execute.c
|
|
@@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;
|
|
/* Wildcard translator for GRUB script. */
|
|
struct grub_script_wildcard_translator *grub_wildcard_translator;
|
|
|
|
+static int
|
|
+is_hex(char c)
|
|
+{
|
|
+ return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
|
|
+}
|
|
+
|
|
static char*
|
|
wildcard_escape (const char *s)
|
|
{
|
|
@@ -72,7 +78,15 @@ wildcard_escape (const char *s)
|
|
i = 0;
|
|
while ((ch = *s++))
|
|
{
|
|
- if (ch == '*' || ch == '\\' || ch == '?')
|
|
+ if (ch == '\\' && s[0] == 'x' && is_hex(s[1]) && is_hex(s[2]))
|
|
+ {
|
|
+ p[i++] = ch;
|
|
+ p[i++] = *s++;
|
|
+ p[i++] = *s++;
|
|
+ p[i++] = *s++;
|
|
+ continue;
|
|
+ }
|
|
+ else if (ch == '*' || ch == '\\' || ch == '?')
|
|
p[i++] = '\\';
|
|
p[i++] = ch;
|
|
}
|
|
@@ -96,7 +110,14 @@ wildcard_unescape (const char *s)
|
|
i = 0;
|
|
while ((ch = *s++))
|
|
{
|
|
- if (ch == '\\')
|
|
+ if (ch == '\\' && s[0] == 'x' && is_hex(s[1]) && is_hex(s[2]))
|
|
+ {
|
|
+ p[i++] = '\\';
|
|
+ p[i++] = *s++;
|
|
+ p[i++] = *s++;
|
|
+ p[i++] = *s++;
|
|
+ }
|
|
+ else if (ch == '\\')
|
|
p[i++] = *s++;
|
|
else
|
|
p[i++] = ch;
|
|
@@ -398,10 +419,20 @@ parse_string (const char *str,
|
|
switch (*ptr)
|
|
{
|
|
case '\\':
|
|
- escaped = !escaped;
|
|
- if (!escaped && put)
|
|
- *(put++) = '\\';
|
|
- ptr++;
|
|
+ if (!escaped && put && *(ptr+1) == 'x' && is_hex(*(ptr+2)) && is_hex(*(ptr+3)))
|
|
+ {
|
|
+ *(put++) = *ptr++;
|
|
+ *(put++) = *ptr++;
|
|
+ *(put++) = *ptr++;
|
|
+ *(put++) = *ptr++;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ escaped = !escaped;
|
|
+ if (!escaped && put)
|
|
+ *(put++) = '\\';
|
|
+ ptr++;
|
|
+ }
|
|
break;
|
|
case '$':
|
|
if (escaped)
|