2006-10-05 Tristan Gingold <tristan.gingold@bull.net>

        * kern/misc.c (grub_strtoull): Guess the base only if not
        specified.

diff --git a/ChangeLog b/ChangeLog
index 23f0187cf038f41b222b838e8b023ec99dde90e8..d3950e2bcfb5d5066c950b0009da935a37bf7844 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-05  Tristan Gingold  <tristan.gingold@bull.net>
+
+       * kern/misc.c (grub_strtoull): Guess the base only if not
+       specified.
+
 2005-10-01  Hollis Blanchard  <hollis@penguinppc.org>
 
        * kern/powerpc/ieee1275/cmain.c (cmain): Remove incomplete Old World

diff --git a/kern/misc.c b/kern/misc.c
index cbf1560a32e84b1b7db917e2dc63e136ca13cc5a..e8dfa3a5ffdbf719a0097af071b341fd5f049bb4 100644 (file)
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -366,7 +366,7 @@ grub_strtoull (const char *str, char **end, int base)
   
   /* Guess the base, if not specified. The prefix `0x' means 16, and
      the prefix `0' means 8.  */
-  if (str[0] == '0')
+  if (base == 0 && str[0] == '0')
     {
       if (str[1] == 'x')
        {