vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix wildcard regexp dot and other special characters handling.

Browse source 
Reported by: Robert Mabee.

	* grub-core/commands/wildcard.c (isregexop): Add "|+{}[]?".
	(make_regex): Escape "|+{}[]". Transform '?' to '.?'.
	(split_path): Trigger expansion on '?'.
	(unescape): New function.
	(wildcard_expand): Unescape parts copied without globbing.
	* grub-core/script/execute.c (wildcard_escape): Escape '?'.
	(grub_script_arglist_to_argv): Don't unescape expansions.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-19 14:13:19 +02:00
parent 0494408e7e
commit 485568790c
3 changed files with 52 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2012-06-19 Vladimir Serbinenko <phcoder@gmail.com>
Fix wildcard regexp dot and other special characters handling.
Reported by: Robert Mabee.
* grub-core/commands/wildcard.c (isregexop): Add "|+{}[]?".
(make_regex): Escape "|+{}[]". Transform '?' to '.?'.
(split_path): Trigger expansion on '?'.
(unescape): New function.
(wildcard_expand): Unescape parts copied without globbing.
* grub-core/script/execute.c (wildcard_escape): Escape '?'.
(grub_script_arglist_to_argv): Don't unescape expansions.
2012-06-19 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-19 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/net.h (grub_net_card): New member txbufsize. * include/grub/net.h (grub_net_card): New member txbufsize.

44
grub-core/commands/wildcard.c
View file

@ -80,7 +80,7 @@ merge (char **dest, char **ps)
static inline int static inline int
isregexop (char ch) isregexop (char ch)
{ {
return grub_strchr ("*.\\", ch) ? 1 : 0; return grub_strchr ("*.\\|+{}[]?", ch) ? 1 : 0;
} }
static char * static char *
@ -123,7 +123,7 @@ make_regex (const char *start, const char *end, regex_t *regexp)
buffer[i++] = '^'; buffer[i++] = '^';
while (start < end) while (start < end)
{ {
/* XXX Only * expansion for now. */ /* XXX Only * and ? expansion for now. */
switch ((ch = *start++)) switch ((ch = *start++))
{ {
case '\\': case '\\':
@ -136,6 +136,12 @@ make_regex (const char *start, const char *end, regex_t *regexp)
case '(': case '(':
case ')': case ')':
case '@': case '@':
case '+':
case '|':
case '{':
case '}':
case '[':
case ']':
buffer[i++] = '\\'; buffer[i++] = '\\';
buffer[i++] = ch; buffer[i++] = ch;
break; break;
@ -145,6 +151,10 @@ make_regex (const char *start, const char *end, regex_t *regexp)
buffer[i++] = '*'; buffer[i++] = '*';
break; break;
case '?':
buffer[i++] = '.';
break;
default: default:
buffer[i++] = ch; buffer[i++] = ch;
} }
@ -181,7 +191,7 @@ split_path (const char *str, const char **noregexop, const char **regexop)
if (ch == '\\' && end[1]) if (ch == '\\' && end[1])
end++; end++;
else if (isregexop (ch)) else if (ch == '*' || ch == '?')
regex = 1; regex = 1;
else if (ch == '/' && ! regex) else if (ch == '/' && ! regex)
@ -410,6 +420,27 @@ check_file (const char *dir, const char *basename)
return found; return found;
} }
static void
unescape (char *out, const char *in, const char *end)
{
char *optr;
const char *iptr;
for (optr = out, iptr = in; iptr < end;)
{
if (*iptr == '\\' && iptr + 1 < end)
{
*optr++ = iptr[1];
iptr += 2;
continue;
}
if (*iptr == '\\')
break;
*optr++ = *iptr++;
}
*optr = 0;
}
static grub_err_t static grub_err_t
wildcard_expand (const char *s, char ***strs) wildcard_expand (const char *s, char ***strs)
{ {
@ -442,8 +473,7 @@ wildcard_expand (const char *s, char ***strs)
paths[0] = grub_malloc (regexop - start + 1); paths[0] = grub_malloc (regexop - start + 1);
if (!paths[0]) if (!paths[0])
goto fail; goto fail;
grub_memcpy (paths[0], start, regexop - start); unescape (paths[0], start, regexop);
paths[0][regexop - start] = '\0';
paths[1] = 0; paths[1] = 0;
} }
else else
@ -460,8 +490,8 @@ wildcard_expand (const char *s, char ***strs)
if (!n) if (!n)
goto fail; goto fail;
grub_memcpy (n, o, oend - o); grub_memcpy (n, o, oend - o);
grub_memcpy (n + (oend - o), start, regexop - start);
n[(oend - o) + (regexop - start)] = '\0'; unescape (n + (oend - o), start, regexop);
if (had_regexp) if (had_regexp)
p = grub_strrchr (n, '/'); p = grub_strrchr (n, '/');
else else

4
grub-core/script/execute.c
View file

@ -68,7 +68,7 @@ wildcard_escape (const char *s)
i = 0; i = 0;
while ((ch = *s++)) while ((ch = *s++))
{ {
if (ch == '*' || ch == '\\') if (ch == '*' || ch == '\\' || ch == '?')
p[i++] = '\\'; p[i++] = '\\';
p[i++] = ch; p[i++] = ch;
} }
@ -706,7 +706,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
for (j = 0; expansions[j]; j++) for (j = 0; expansions[j]; j++)
{ {
failed = (failed || grub_script_argv_next (&result) || failed = (failed || grub_script_argv_next (&result) ||
append (expansions[j], -1)); append (expansions[j], 0));
grub_free (expansions[j]); grub_free (expansions[j]);
} }
grub_free (expansions); grub_free (expansions);