From: Mike Pall <mike>
Date: Tue, 3 Sep 2013 14:11:39 +0000 (+0200)
Subject: Fix string.format("%#X", 1).
X-Git-Tag: v2.1.0-beta1~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8e36535f79a2bbd192f99888cb0c4642fb87f4f;p=thirdparty%2FLuaJIT.git

Fix string.format("%#X", 1).
---

diff --git a/src/lj_strfmt.c b/src/lj_strfmt.c
index 614bd4ef..24100ed2 100644
--- a/src/lj_strfmt.c
+++ b/src/lj_strfmt.c
@@ -303,7 +303,7 @@ SBuf *lj_strfmt_putfxint(SBuf *sb, SFormat sf, uint64_t k)
     const char *hexdig = (sf & STRFMT_F_UPPER) ? "0123456789ABCDEF" :
 						 "0123456789abcdef";
     do { *--q = hexdig[(k & 15)]; k >>= 4; } while (k);
-    if ((sf & STRFMT_F_ALT)) prefix = 512 + 'x';
+    if ((sf & STRFMT_F_ALT)) prefix = 512 + ((sf & STRFMT_F_UPPER) ? 'X' : 'x');
   } else {  /* Octal. */
     do { *--q = (char)('0' + (uint32_t)(k & 7)); k >>= 3; } while (k);
     if ((sf & STRFMT_F_ALT)) *--q = '0';
@@ -324,7 +324,7 @@ SBuf *lj_strfmt_putfxint(SBuf *sb, SFormat sf, uint64_t k)
   if ((sf & (STRFMT_F_LEFT|STRFMT_F_ZERO)) == 0)
     while (width-- > pprec) *p++ = ' ';
   if (prefix) {
-    if ((char)prefix == 'x') *p++ = '0';
+    if ((char)prefix >= 'X') *p++ = '0';
     *p++ = (char)prefix;
   }
   if ((sf & (STRFMT_F_LEFT|STRFMT_F_ZERO)) == STRFMT_F_ZERO)