* grub-core/commands/wildcard.c (make_regex): Handle @.

diff --git a/ChangeLog b/ChangeLog
index 26af06ed3e1099e59ed7202b2dd5ed8566a925de..345f8f4cd448b2ccbadae017657854b47f17e708 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/wildcard.c (make_regex): Handle @.
+
 2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-install.in: Move cryptodisk logic to appropriate place.

diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index d2f4347d5408af6a82ef895240986821f07080b6..256c07e51cbff126ebaf2f4d91b7c6f5122705b5 100644 (file)
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -139,6 +139,7 @@ make_regex (const char *start, const char *end, regex_t *regexp)
        case '.':
        case '(':
        case ')':
+       case '@':
          buffer[i++] = '\\';
          buffer[i++] = ch;
          break;