vasnprintf: Support I flag on glibc systems.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index d021ef51ab3c5fd2e35fb64da315c7c23bac8d94..76b0f49b636104c76cf8b693b3269395a3cd24c2 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-07  Bruno Haible  <bruno@clisp.org>
+
+       vasnprintf: Support I flag on glibc systems.
+       * printf-parse.h (FLAG_LOCALIZED): New macro.
+       * printf-parse.c (PRINTF_PARSE): Handle the 'I' flag.
+       * vasnprintf.c (VASNPRINTF): Pass the 'I' flag on to the system's
+       snprintf function.
+
 2010-11-07  Bruno Haible  <bruno@clisp.org>
 
        Rename libgnuintl.h.in to libgnuintl.in.h.

diff --git a/gettext-runtime/intl/printf-parse.c b/gettext-runtime/intl/printf-parse.c
index 3f3174d06e0bdebce22f015ab2d6317d8f9f72ac..5fe8da6739c9ce5c683d5b42acf56ae5618c541a 100644 (file)
--- a/gettext-runtime/intl/printf-parse.c
+++ b/gettext-runtime/intl/printf-parse.c
@@ -207,6 +207,13 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                   dp->flags |= FLAG_ZERO;
                   cp++;
                 }
+#if __GLIBC__ >= 2
+              else if (*cp == 'I')
+                {
+                  dp->flags |= FLAG_LOCALIZED;
+                  cp++;
+                }
+#endif
               else
                 break;
             }

diff --git a/gettext-runtime/intl/printf-parse.h b/gettext-runtime/intl/printf-parse.h
index 51ead29ec40be0dfe085bb7caf642c01a4d60c3a..82e5359b63dad0e928856e245fe33a43500a51c5 100644 (file)
--- a/gettext-runtime/intl/printf-parse.h
+++ b/gettext-runtime/intl/printf-parse.h
@@ -29,6 +29,9 @@
 #define FLAG_SPACE       8      /* space flag */
 #define FLAG_ALT        16      /* # flag */
 #define FLAG_ZERO       32
+#if __GLIBC__ >= 2
+# define FLAG_LOCALIZED 64      /* I flag, uses localized digits */
+#endif
 
 /* arg_index value indicating that no argument is consumed.  */
 #define ARG_NONE        (~(size_t)0)

diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index 3dd8b3f304b99f78d5408eb281e35f12fc89b198..55dbb27af5044f81cab6078a097f003f6069b996 100644 (file)
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -4753,6 +4753,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   *fbp++ = ' ';
                 if (flags & FLAG_ALT)
                   *fbp++ = '#';
+#if __GLIBC__ >= 2
+                if (flags & FLAG_LOCALIZED)
+                  *fbp++ = 'I';
+#endif
                 if (!pad_ourselves)
                   {
                     if (flags & FLAG_ZERO)

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 8a38e514e586faa215d52497ceebb92eb674a62f..50f619f2c42e5af45ae05fd273ff92b5aaa5da74 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-07  Bruno Haible  <bruno@clisp.org>
+
+       vasnprintf: Support I flag on glibc systems.
+       * printf-parse.h (FLAG_LOCALIZED): New macro.
+       * printf-parse.c (PRINTF_PARSE): Handle the 'I' flag.
+       * vasnprintf.c (VASNPRINTF): Pass the 'I' flag on to the system's
+       snprintf function.
+
 2010-11-07  Bruno Haible  <bruno@clisp.org>
 
        Rename autosprintf.h.in to autosprintf.in.h.

diff --git a/gettext-runtime/libasprintf/printf-parse.c b/gettext-runtime/libasprintf/printf-parse.c
index 3f3174d06e0bdebce22f015ab2d6317d8f9f72ac..5fe8da6739c9ce5c683d5b42acf56ae5618c541a 100644 (file)
--- a/gettext-runtime/libasprintf/printf-parse.c
+++ b/gettext-runtime/libasprintf/printf-parse.c
@@ -207,6 +207,13 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                   dp->flags |= FLAG_ZERO;
                   cp++;
                 }
+#if __GLIBC__ >= 2
+              else if (*cp == 'I')
+                {
+                  dp->flags |= FLAG_LOCALIZED;
+                  cp++;
+                }
+#endif
               else
                 break;
             }

diff --git a/gettext-runtime/libasprintf/printf-parse.h b/gettext-runtime/libasprintf/printf-parse.h
index 51ead29ec40be0dfe085bb7caf642c01a4d60c3a..82e5359b63dad0e928856e245fe33a43500a51c5 100644 (file)
--- a/gettext-runtime/libasprintf/printf-parse.h
+++ b/gettext-runtime/libasprintf/printf-parse.h
@@ -29,6 +29,9 @@
 #define FLAG_SPACE       8      /* space flag */
 #define FLAG_ALT        16      /* # flag */
 #define FLAG_ZERO       32
+#if __GLIBC__ >= 2
+# define FLAG_LOCALIZED 64      /* I flag, uses localized digits */
+#endif
 
 /* arg_index value indicating that no argument is consumed.  */
 #define ARG_NONE        (~(size_t)0)

diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index 3dd8b3f304b99f78d5408eb281e35f12fc89b198..55dbb27af5044f81cab6078a097f003f6069b996 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -4753,6 +4753,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   *fbp++ = ' ';
                 if (flags & FLAG_ALT)
                   *fbp++ = '#';
+#if __GLIBC__ >= 2
+                if (flags & FLAG_LOCALIZED)
+                  *fbp++ = 'I';
+#endif
                 if (!pad_ourselves)
                   {
                     if (flags & FLAG_ZERO)