Fix bug introduced on 2007-06-10.

diff --git a/ChangeLog b/ChangeLog
index 7d64aa0772b611a845cc0fa792d2d37bc9e42efc..5fbb4947d399cdf59f7190586fafbb5360280f7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-06  Bruno Haible  <bruno@clisp.org>
+
+       Fix bug introduced on 2007-06-10.
+       * lib/vasnprintf.c (VASNPRINTF): Perform zero-padding also if
+       !NEED_PRINTF_FLAG_ZERO.
+
 2008-02-05  Peter O'Gorman <pogma@thewrittenword.com>
 
        getloadavg: use libperfstat on AIX5

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 19cc009a3e80920f9ed90e633f49c6a749f8ac26..1a74a44b540a1edb68c4fb4ea1cc62c8b7a5f479 100644 (file)
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -4535,15 +4535,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 # endif
                              DCHAR_T *p = rp + count;
                              DCHAR_T *end = p + pad;
-# if NEED_PRINTF_FLAG_ZERO
                              DCHAR_T *pad_ptr;
-#  if !DCHAR_IS_TCHAR
+# if !DCHAR_IS_TCHAR
                              if (dp->conversion == 'c'
                                  || dp->conversion == 's')
                                /* No zero-padding for string directives.  */
                                pad_ptr = NULL;
                              else
-#  endif
+# endif
                                {
                                  pad_ptr = (*rp == '-' ? rp + 1 : rp);
                                  /* No zero-padding of "inf" and "nan".  */
@@ -4551,7 +4550,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                      || (*pad_ptr >= 'a' && *pad_ptr <= 'z'))
                                    pad_ptr = NULL;
                                }
-# endif
                              /* The generated string now extends from rp to p,
                                 with the zero padding insertion point being at
                                 pad_ptr.  */
@@ -4564,7 +4562,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                  for (; pad > 0; pad--)
                                    *p++ = ' ';
                                }
-# if NEED_PRINTF_FLAG_ZERO
                              else if ((flags & FLAG_ZERO) && pad_ptr != NULL)
                                {
                                  /* Pad with zeroes.  */
@@ -4575,7 +4572,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                  for (; pad > 0; pad--)
                                    *p++ = '0';
                                }
-# endif
                              else
                                {
                                  /* Pad with spaces on the left.  */