From: jrydberg <jrydberg@localhost>
Date: Thu, 5 Oct 2006 12:19:56 +0000 (+0000)
Subject: 2006-10-05  Tristan Gingold  <tristan.gingold@bull.net>
X-Git-Tag: 1.98~1916
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da849d2df55d005eb21ee1a9d0615d257d34c7c1;p=thirdparty%2Fgrub.git

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 23f0187cf..d3950e2bc 100644
--- 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 cbf1560a3..e8dfa3a5f 100644
--- 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')
 	{