Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LsYGY-0004DL-UI for mharc-grub-devel@gnu.org; Sat, 11 Apr 2009 04:08:42 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LsYGX-0004CD-7Q for grub-devel@gnu.org; Sat, 11 Apr 2009 04:08:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LsYGV-0004BA-HM for grub-devel@gnu.org; Sat, 11 Apr 2009 04:08:40 -0400 Received: from [199.232.76.173] (port=58789 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LsYGV-0004B3-Bz for grub-devel@gnu.org; Sat, 11 Apr 2009 04:08:39 -0400 Received: from [74.93.104.97] (port=49119 helo=sunset.davemloft.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LsYGU-0006yO-Sm for grub-devel@gnu.org; Sat, 11 Apr 2009 04:08:39 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 579C535C12A for ; Sat, 11 Apr 2009 01:08:29 -0700 (PDT) Date: Sat, 11 Apr 2009 01:08:29 -0700 (PDT) Message-Id: <20090411.010829.45951849.davem@davemloft.net> To: grub-devel@gnu.org From: David Miller X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH]: grub: Fix handling of long printf arguments on 64-bit. X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2009 08:08:41 -0000 The grub printf code tries to treat 'long' and 'int' the same, that doesn't work on (most) 64-bit platforms. 2009-04-11 David S. Miller * kern/misc.c (grub_ltoa): New function. (grub_vsprintf): Use it to format 'long' integers. --- kern/misc.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/kern/misc.c b/kern/misc.c index 23eaa14..85a5d95 100644 --- a/kern/misc.c +++ b/kern/misc.c @@ -590,6 +590,31 @@ grub_itoa (char *str, int c, unsigned n) return p; } +static char * +grub_ltoa (char *str, int c, unsigned long n) +{ + unsigned long base = (c == 'x') ? 16 : 10; + char *p; + + if ((long) n < 0 && c == 'd') + { + n = (unsigned) (-((long) n)); + *str++ = '-'; + } + + p = str; + do + { + unsigned long d = n % base; + *p++ = (d > 9) ? d + 'a' - 10 : d + '0'; + } + while (n /= base); + *p = 0; + + grub_reverse (str); + return p; +} + /* Divide N by D, return the quotient, and store the remainder in *R. */ grub_uint64_t grub_divmod64 (grub_uint64_t n, grub_uint32_t d, grub_uint32_t *r) @@ -790,12 +815,14 @@ grub_vsprintf (char *str, const char *fmt, va_list args) ll = va_arg (args, long long); grub_lltoa (tmp, c, ll); } + else if (longfmt) + { + long l = va_arg (args, long); + grub_ltoa (tmp, c, l); + } else { - if (longfmt) - n = va_arg (args, long); - else - n = va_arg (args, int); + n = va_arg (args, int); grub_itoa (tmp, c, n); } if (! rightfill && grub_strlen (tmp) < format1) -- 1.6.2.2