Test HAVE_SYS__MBSTATE_H, not __hpux. Merge changes

from gnulib.

1 files changed, 845 insertions, 741 deletions

diff --git a/src/strftime.c b/src/strftime.c
index ecfed2af398..4ca6023aa41 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,14 +1,17 @@
 /* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,2003
              Free Software Foundation, Inc.
 
+   NOTE: The canonical source of this file is maintained with gnulib.
+   Bugs can be reported to bug-gnulib@gnu.org.
+
    This file is part of the GNU Emacs.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License
+   as published by the Free Software Foundation; either version 2, or
+   (at your option) any later version.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
@@ -36,12 +39,8 @@
 # include "../locale/localeinfo.h"
 #endif
 
-#if defined emacs && !defined HAVE_BCOPY
-# define HAVE_MEMCPY 1
-#endif
-
 #include <ctype.h>
-#include <sys/types.h>          /* Some systems define `time_t' here.  */
+#include <sys/types.h>		/* Some systems define `time_t' here.  */
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -70,7 +69,7 @@ extern char *tzname[];
 #if DO_MULTIBYTE
 # if HAVE_MBRLEN
 #  include <wchar.h>
-#   if __hpux
+#   ifdef HAVE_SYS__MBSTATE_H	/* previously tested __hpux */
 #     include <sys/_mbstate_t.h>
 #   endif
 #  if !defined (mbsinit) && !defined (HAVE_MBSINIT)
@@ -92,6 +91,7 @@ extern char *tzname[];
 #ifdef STDC_HEADERS
 # include <stddef.h>
 # include <stdlib.h>
+# include <string.h>
 #else
 # ifndef HAVE_MEMCPY
 #  define memcpy(d, s, n) bcopy ((s), (d), (n))
@@ -131,9 +131,7 @@ extern char *tzname[];
 #endif
 
 #ifndef __P
-# if defined emacs && defined PROTOTYPES
-#  define __P(args) args
-# elif defined __GNUC__ || (defined __STDC__ && __STDC__)
+# if defined __GNUC__ || (defined __STDC__ && __STDC__) || defined (PROTOTYPES)
 #  define __P(args) args
 # else
 #  define __P(args) ()
@@ -171,7 +169,7 @@ extern char *tzname[];
 #ifndef __isleap
 /* Nonzero if YEAR is a leap year (every 4 years,
    except every 100th isn't, and every 400th is).  */
-# define __isleap(year) \
+# define __isleap(year)	\
   ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
 #endif
 
@@ -214,7 +212,6 @@ my_strftime_localtime_r (t, tp)
   return tp;
 }
 # endif /* ! HAVE_TM_GMTOFF */
-
 #endif /* ! defined _LIBC */
 
 
@@ -235,29 +232,29 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
 };
 
 # define memset_space(P, Len) \
-  do {                                                                        \
-    int _len = (Len);                                                         \
-                                                                              \
-    do                                                                        \
-      {                                                                       \
-        int _this = _len > 16 ? 16 : _len;                                    \
-        (P) = MEMPCPY ((P), spaces, _this * sizeof (CHAR_T));                 \
-        _len -= _this;                                                        \
-      }                                                                       \
-    while (_len > 0);                                                         \
+  do {									      \
+    int _len = (Len);							      \
+									      \
+    do									      \
+      {									      \
+	int _this = _len > 16 ? 16 : _len;				      \
+	(P) = MEMPCPY ((P), spaces, _this * sizeof (CHAR_T));		      \
+	_len -= _this;							      \
+      }									      \
+    while (_len > 0);							      \
   } while (0)
 
 # define memset_zero(P, Len) \
-  do {                                                                        \
-    int _len = (Len);                                                         \
-                                                                              \
-    do                                                                        \
-      {                                                                       \
-        int _this = _len > 16 ? 16 : _len;                                    \
-        (P) = MEMPCPY ((P), zeroes, _this * sizeof (CHAR_T));                 \
-        _len -= _this;                                                        \
-      }                                                                       \
-    while (_len > 0);                                                         \
+  do {									      \
+    int _len = (Len);							      \
+									      \
+    do									      \
+      {									      \
+	int _this = _len > 16 ? 16 : _len;				      \
+	(P) = MEMPCPY ((P), zeroes, _this * sizeof (CHAR_T));		      \
+	_len -= _this;							      \
+      }									      \
+    while (_len > 0);							      \
   } while (0)
 #else
 # ifdef COMPILE_WIDE
@@ -269,61 +266,102 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
 # endif
 #endif
 
-#define add(n, f)                                                             \
-  do                                                                          \
-    {                                                                         \
-      int _n = (n);                                                           \
-      int _delta = width - _n;                                                \
-      int _incr = _n + (_delta > 0 ? _delta : 0);                             \
-      if (i + _incr >= maxsize)                                               \
-        return 0;                                                             \
-      if (p)                                                                  \
-        {                                                                     \
-          if (_delta > 0)                                                     \
-            {                                                                 \
-              if (pad == L_('0'))                                             \
-                memset_zero (p, _delta);                                      \
-              else                                                            \
-                memset_space (p, _delta);                                     \
-            }                                                                 \
-          f;                                                                  \
-          p += _n;                                                            \
-        }                                                                     \
-      i += _incr;                                                             \
+#define add(n, f)							      \
+  do									      \
+    {									      \
+      int _n = (n);							      \
+      int _delta = width - _n;						      \
+      int _incr = _n + (_delta > 0 ? _delta : 0);			      \
+      if ((size_t) _incr >= maxsize - i)				      \
+	return 0;							      \
+      if (p)								      \
+	{								      \
+	  if (_delta > 0)						      \
+	    {								      \
+	      if (pad == L_('0'))					      \
+		memset_zero (p, _delta);				      \
+	      else							      \
+		memset_space (p, _delta);				      \
+	    }								      \
+	  f;								      \
+	  p += _n;							      \
+	}								      \
+      i += _incr;							      \
     } while (0)
 
 #define cpy(n, s) \
-    add ((n),                                                                 \
-         if (to_lowcase)                                                      \
-           memcpy_lowcase (p, (s), _n);                                       \
-         else if (to_uppcase)                                                 \
-           memcpy_uppcase (p, (s), _n);                                       \
-         else                                                                 \
-           MEMCPY ((PTR) p, (PTR) (s), _n))
+    add ((n),								      \
+	 if (to_lowcase)						      \
+	   memcpy_lowcase (p, (s), _n LOCALE_ARG);			      \
+	 else if (to_uppcase)						      \
+	   memcpy_uppcase (p, (s), _n LOCALE_ARG);			      \
+	 else								      \
+	   MEMCPY ((PTR) p, (const PTR) (s), _n))
 
 #ifdef COMPILE_WIDE
+# ifndef USE_IN_EXTENDED_LOCALE_MODEL
+#  undef __mbsrtowcs_l
+#  define __mbsrtowcs_l(d, s, l, st, loc) __mbsrtowcs (d, s, l, st)
+# endif
 # define widen(os, ws, l) \
-  {                                                                           \
-    mbstate_t __st;                                                           \
-    const char *__s = os;                                                     \
-    memset (&__st, '\0', sizeof (__st));                                      \
-    l = __mbsrtowcs (NULL, &__s, 0, &__st);                                   \
-    ws = alloca ((l + 1) * sizeof (wchar_t));                                 \
-    (void) __mbsrtowcs (ws, &__s, l, &__st);                                  \
+  {									      \
+    mbstate_t __st;							      \
+    const char *__s = os;						      \
+    memset (&__st, '\0', sizeof (__st));				      \
+    l = __mbsrtowcs_l (NULL, &__s, 0, &__st, loc);			      \
+    ws = (wchar_t *) alloca ((l + 1) * sizeof (wchar_t));		      \
+    (void) __mbsrtowcs_l (ws, &__s, l, &__st, loc);			      \
   }
 #endif
 
 
+#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
+/* We use this code also for the extended locale handling where the
+   function gets as an additional argument the locale which has to be
+   used.  To access the values we have to redefine the _NL_CURRENT
+   macro.  */
+# define strftime		__strftime_l
+# define wcsftime		__wcsftime_l
+# undef _NL_CURRENT
+# define _NL_CURRENT(category, item) \
+  (current->values[_NL_ITEM_INDEX (item)].string)
+# define LOCALE_PARAM , loc
+# define LOCALE_ARG , loc
+# define LOCALE_PARAM_DECL  __locale_t loc;
+# define LOCALE_PARAM_PROTO , __locale_t loc
+# define HELPER_LOCALE_ARG  , current
+#else
+# define LOCALE_PARAM
+# define LOCALE_PARAM_PROTO
+# define LOCALE_ARG
+# define LOCALE_PARAM_DECL
+# ifdef _LIBC
+#  define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME)
+# else
+#  define HELPER_LOCALE_ARG
+# endif
+#endif
+
 #ifdef COMPILE_WIDE
-# define TOUPPER(Ch) towupper (Ch)
-# define TOLOWER(Ch) towlower (Ch)
+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+#  define TOUPPER(Ch, L) __towupper_l (Ch, L)
+#  define TOLOWER(Ch, L) __towlower_l (Ch, L)
+# else
+#  define TOUPPER(Ch, L) towupper (Ch)
+#  define TOLOWER(Ch, L) towlower (Ch)
+# endif
 #else
 # ifdef _LIBC
-#  define TOUPPER(Ch) toupper (Ch)
-#  define TOLOWER(Ch) tolower (Ch)
+#  ifdef USE_IN_EXTENDED_LOCALE_MODEL
+#   define TOUPPER(Ch, L) __toupper_l (Ch, L)
+#   define TOLOWER(Ch, L) __tolower_l (Ch, L)
+#  else
+#   define TOUPPER(Ch, L) toupper (Ch)
+#   define TOLOWER(Ch, L) tolower (Ch)
+#  endif
 # else
-#  define TOUPPER(Ch) (islower (Ch) ? toupper (Ch) : (Ch))
-#  define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+#  define TOUPPER(Ch, L) (islower (Ch) ? toupper (Ch) : (Ch))
+#  define TOLOWER(Ch, L) (isupper (Ch) ? tolower (Ch) : (Ch))
 # endif
 #endif
 /* We don't use `isdigit' here since the locale dependent
@@ -333,30 +371,32 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
 #define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9)
 
 static CHAR_T *memcpy_lowcase __P ((CHAR_T *dest, const CHAR_T *src,
-                                    size_t len));
+				    size_t len LOCALE_PARAM_PROTO));
 
 static CHAR_T *
-memcpy_lowcase (dest, src, len)
+memcpy_lowcase (dest, src, len LOCALE_PARAM)
      CHAR_T *dest;
      const CHAR_T *src;
      size_t len;
+     LOCALE_PARAM_DECL
 {
   while (len-- > 0)
-    dest[len] = TOLOWER ((UCHAR_T) src[len]);
+    dest[len] = TOLOWER ((UCHAR_T) src[len], loc);
   return dest;
 }
 
 static CHAR_T *memcpy_uppcase __P ((CHAR_T *dest, const CHAR_T *src,
-                                    size_t len));
+				    size_t len LOCALE_PARAM_PROTO));
 
 static CHAR_T *
-memcpy_uppcase (dest, src, len)
+memcpy_uppcase (dest, src, len LOCALE_PARAM)
      CHAR_T *dest;
      const CHAR_T *src;
      size_t len;
+     LOCALE_PARAM_DECL
 {
   while (len-- > 0)
-    dest[len] = TOUPPER ((UCHAR_T) src[len]);
+    dest[len] = TOUPPER ((UCHAR_T) src[len], loc);
   return dest;
 }
 
@@ -383,10 +423,10 @@ tm_diff (a, b)
   int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
   int years = a->tm_year - b->tm_year;
   int days = (365 * years + intervening_leap_days
-              + (a->tm_yday - b->tm_yday));
+	      + (a->tm_yday - b->tm_yday));
   return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
-                + (a->tm_min - b->tm_min))
-          + (a->tm_sec - b->tm_sec));
+		+ (a->tm_min - b->tm_min))
+	  + (a->tm_sec - b->tm_sec));
 }
 #endif /* ! HAVE_TM_GMTOFF */
 
@@ -411,8 +451,8 @@ iso_week_days (yday, wday)
   /* Add enough to the first operand of % to make it nonnegative.  */
   int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
   return (yday
-          - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
-          + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
+	  - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
+	  + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
 }
 
 
@@ -431,40 +471,46 @@ static CHAR_T const month_name[][10] =
 #endif
 
 
-#ifdef emacs
-# define my_strftime emacs_strftimeu
-# define ut_argument , ut
-# define ut_argument_spec int ut;
-# define ut_argument_spec_iso , int ut
+/* When compiling this file, GNU applications can #define my_strftime
+   to a symbol (typically nstrftime) to get an extended strftime with
+   extra arguments UT and NS.  */
+
+#ifdef my_strftime
+# define extra_args , ut, ns
+# define extra_args_spec int ut; int ns;
+# define extra_args_spec_iso , int ut, int ns
 #else
 # ifdef COMPILE_WIDE
 #  define my_strftime wcsftime
+#  define nl_get_alt_digit _nl_get_walt_digit
 # else
 #  define my_strftime strftime
+#  define nl_get_alt_digit _nl_get_alt_digit
 # endif
-# define ut_argument
-# define ut_argument_spec
-# define ut_argument_spec_iso
+# define extra_args
+# define extra_args_spec
+# define extra_args_spec_iso
 /* We don't have this information in general.  */
 # define ut 0
+# define ns 0
 #endif
 
 #if !defined _LIBC && !defined(WINDOWSNT) && HAVE_TZNAME && HAVE_TZSET
   /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime.
      Work around this bug by copying *tp before it might be munged.  */
   size_t _strftime_copytm __P ((char *, size_t, const char *,
-                                const struct tm * ut_argument_spec_iso));
+			        const struct tm * extra_args_spec_iso));
   size_t
-  my_strftime (s, maxsize, format, tp ut_argument)
+  my_strftime (s, maxsize, format, tp extra_args)
       CHAR_T *s;
       size_t maxsize;
       const CHAR_T *format;
       const struct tm *tp;
-      ut_argument_spec
+      extra_args_spec
   {
     struct tm tmcopy;
     tmcopy = *tp;
-    return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument);
+    return _strftime_copytm (s, maxsize, format, &tmcopy extra_args);
   }
 # undef my_strftime
 # define my_strftime _strftime_copytm
@@ -478,13 +524,18 @@ static CHAR_T const month_name[][10] =
    anywhere, so to determine how many characters would be
    written, use NULL for S and (size_t) UINT_MAX for MAXSIZE.  */
 size_t
-my_strftime (s, maxsize, format, tp ut_argument)
+my_strftime (s, maxsize, format, tp extra_args LOCALE_PARAM)
       CHAR_T *s;
       size_t maxsize;
       const CHAR_T *format;
       const struct tm *tp;
-      ut_argument_spec
+      extra_args_spec
+      LOCALE_PARAM_DECL
 {
+#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
+  struct locale_data *const current = loc->__locales[LC_TIME];
+#endif
+
   int hour12 = tp->tm_hour;
 #ifdef _NL_CURRENT
   /* We cannot make the following values variables since we must delay
@@ -502,8 +553,8 @@ my_strftime (s, maxsize, format, tp ut_argument)
 # define f_month \
   ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon))
 # define ampm \
-  ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11                    \
-                                 ? NLW(PM_STR) : NLW(AM_STR)))
+  ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11		      \
+				 ? NLW(PM_STR) : NLW(AM_STR)))
 
 # define aw_len STRLEN (a_wkday)
 # define am_len STRLEN (a_month)
@@ -525,6 +576,9 @@ my_strftime (s, maxsize, format, tp ut_argument)
   size_t i = 0;
   CHAR_T *p = s;
   const CHAR_T *f;
+#if DO_MULTIBYTE && !defined COMPILE_WIDE
+  const char *format_end = NULL;
+#endif
 
   zone = NULL;
 #if HAVE_TM_ZONE
@@ -540,13 +594,12 @@ my_strftime (s, maxsize, format, tp ut_argument)
   if (ut)
     {
       if (! (zone && *zone))
-        zone = "UTC";
+	zone = "GMT";
     }
   else
     {
-      /* POSIX.1 8.1.1 requires that whenever strftime() is called, the
-         time zone names contained in the external variable `tzname' shall
-         be set as if the tzset() function had been called.  */
+      /* POSIX.1 requires that local time zone information be used as
+	 though strftime called tzset.  */
 # if HAVE_TZSET
       tzset ();
 # endif
@@ -561,16 +614,16 @@ my_strftime (s, maxsize, format, tp ut_argument)
 
   for (f = format; *f != '\0'; ++f)
     {
-      int pad = 0;              /* Padding for number ('-', '_', or 0).  */
-      int modifier;             /* Field modifier ('E', 'O', or 0).  */
-      int digits;               /* Max digits for numeric format.  */
-      int number_value;         /* Numeric value to be printed.  */
-      int negative_number;      /* 1 if the number is negative.  */
+      int pad = 0;		/* Padding for number ('-', '_', or 0).  */
+      int modifier;		/* Field modifier ('E', 'O', or 0).  */
+      int digits;		/* Max digits for numeric format.  */
+      int number_value; 	/* Numeric value to be printed.  */
+      int negative_number;	/* 1 if the number is negative.  */
       const CHAR_T *subfmt;
       CHAR_T *bufp;
       CHAR_T buf[1 + (sizeof (int) < sizeof (time_t)
-                      ? INT_STRLEN_BOUND (time_t)
-                      : INT_STRLEN_BOUND (int))];
+		      ? INT_STRLEN_BOUND (time_t)
+		      : INT_STRLEN_BOUND (int))];
       int width = -1;
       int to_lowcase = 0;
       int to_uppcase = 0;
@@ -579,265 +632,279 @@ my_strftime (s, maxsize, format, tp ut_argument)
 
 #if DO_MULTIBYTE && !defined COMPILE_WIDE
       switch (*f)
-        {
-        case L_('%'):
-          break;
-
-        case L_('\b'): case L_('\t'): case L_('\n'):
-        case L_('\v'): case L_('\f'): case L_('\r'):
-        case L_(' '): case L_('!'): case L_('"'): case L_('#'): case L_('&'):
-        case L_('\''): case L_('('): case L_(')'): case L_('*'): case L_('+'):
-        case L_(','): case L_('-'): case L_('.'): case L_('/'): case L_('0'):
-        case L_('1'): case L_('2'): case L_('3'): case L_('4'): case L_('5'):
-        case L_('6'): case L_('7'): case L_('8'): case L_('9'): case L_(':'):
-        case L_(';'): case L_('<'): case L_('='): case L_('>'): case L_('?'):
-        case L_('A'): case L_('B'): case L_('C'): case L_('D'): case L_('E'):
-        case L_('F'): case L_('G'): case L_('H'): case L_('I'): case L_('J'):
-        case L_('K'): case L_('L'): case L_('M'): case L_('N'): case L_('O'):
-        case L_('P'): case L_('Q'): case L_('R'): case L_('S'): case L_('T'):
-        case L_('U'): case L_('V'): case L_('W'): case L_('X'): case L_('Y'):
-        case L_('Z'): case L_('['): case L_('\\'): case L_(']'): case L_('^'):
-        case L_('_'): case L_('a'): case L_('b'): case L_('c'): case L_('d'):
-        case L_('e'): case L_('f'): case L_('g'): case L_('h'): case L_('i'):
-        case L_('j'): case L_('k'): case L_('l'): case L_('m'): case L_('n'):
-        case L_('o'): case L_('p'): case L_('q'): case L_('r'): case L_('s'):
-        case L_('t'): case L_('u'): case L_('v'): case L_('w'): case L_('x'):
-        case L_('y'): case L_('z'): case L_('{'): case L_('|'): case L_('}'):
-        case L_('~'):
-          /* The C Standard requires these 97 characters (plus '%', `\a') to
-             be in the basic execution character set.  None of these
-             characters can start a multibyte sequence, so they need
-             not be analyzed further.  Some old compilers object to
-	     `\a', so don't bother optimizing for it.  */
-          add (1, *p = *f);
-          continue;
-
-        default:
-          /* Copy this multibyte sequence until we reach its end, find
-             an error, or come back to the initial shift state.  */
-          {
-            mbstate_t mbstate = mbstate_zero;
-            size_t len = 0;
-
-            do
-              {
-                size_t bytes = mbrlen (f + len, (size_t) -1, &mbstate);
-
-                if (bytes == 0)
-                  break;
-
-                if (bytes == (size_t) -2)
-                  {
-                    len += strlen (f + len);
-                    break;
-                  }
-
-                if (bytes == (size_t) -1)
-                  {
-                    len++;
-                    break;
-                  }
-
-                len += bytes;
-              }
-            while (! mbsinit (&mbstate));
-
-            cpy (len, f);
-            f += len - 1;
-            continue;
-          }
-        }
+	{
+	case L_('%'):
+	  break;
+
+	case L_('\b'): case L_('\t'): case L_('\n'):
+	case L_('\v'): case L_('\f'): case L_('\r'):
+	case L_(' '): case L_('!'): case L_('"'): case L_('#'): case L_('&'):
+	case L_('\''): case L_('('): case L_(')'): case L_('*'): case L_('+'):
+	case L_(','): case L_('-'): case L_('.'): case L_('/'): case L_('0'):
+	case L_('1'): case L_('2'): case L_('3'): case L_('4'): case L_('5'):
+	case L_('6'): case L_('7'): case L_('8'): case L_('9'): case L_(':'):
+	case L_(';'): case L_('<'): case L_('='): case L_('>'): case L_('?'):
+	case L_('A'): case L_('B'): case L_('C'): case L_('D'): case L_('E'):
+	case L_('F'): case L_('G'): case L_('H'): case L_('I'): case L_('J'):
+	case L_('K'): case L_('L'): case L_('M'): case L_('N'): case L_('O'):
+	case L_('P'): case L_('Q'): case L_('R'): case L_('S'): case L_('T'):
+	case L_('U'): case L_('V'): case L_('W'): case L_('X'): case L_('Y'):
+	case L_('Z'): case L_('['): case L_('\\'): case L_(']'): case L_('^'):
+	case L_('_'): case L_('a'): case L_('b'): case L_('c'): case L_('d'):
+	case L_('e'): case L_('f'): case L_('g'): case L_('h'): case L_('i'):
+	case L_('j'): case L_('k'): case L_('l'): case L_('m'): case L_('n'):
+	case L_('o'): case L_('p'): case L_('q'): case L_('r'): case L_('s'):
+	case L_('t'): case L_('u'): case L_('v'): case L_('w'): case L_('x'):
+	case L_('y'): case L_('z'): case L_('{'): case L_('|'): case L_('}'):
+	case L_('~'):
+	  /* The C Standard requires these 98 characters (plus '%') to
+	     be in the basic execution character set.  None of these
+	     characters can start a multibyte sequence, so they need
+	     not be analyzed further.  */
+	  add (1, *p = *f);
+	  continue;
+
+	default:
+	  /* Copy this multibyte sequence until we reach its end, find
+	     an error, or come back to the initial shift state.  */
+	  {
+	    mbstate_t mbstate = mbstate_zero;
+	    size_t len = 0;
+	    size_t fsize;
+
+	    if (! format_end)
+	      format_end = f + strlen (f) + 1;
+	    fsize = format_end - f;
+
+	    do
+	      {
+		size_t bytes = mbrlen (f + len, fsize - len, &mbstate);
+
+		if (bytes == 0)
+		  break;
+
+		if (bytes == (size_t) -2)
+		  {
+		    len += strlen (f + len);
+		    break;
+		  }
+
+		if (bytes == (size_t) -1)
+		  {
+		    len++;
+		    break;
+		  }
+
+		len += bytes;
+	      }
+	    while (! mbsinit (&mbstate));
+
+	    cpy (len, f);
+	    f += len - 1;
+	    continue;
+	  }
+	}
 
 #else /* ! DO_MULTIBYTE */
 
       /* Either multibyte encodings are not supported, they are
-         safe for formats, so any non-'%' byte can be copied through,
-         or this is the wide character version.  */
+	 safe for formats, so any non-'%' byte can be copied through,
+	 or this is the wide character version.  */
       if (*f != L_('%'))
-        {
-          add (1, *p = *f);
-          continue;
-        }
+	{
+	  add (1, *p = *f);
+	  continue;
+	}
 
 #endif /* ! DO_MULTIBYTE */
 
       /* Check for flags that can modify a format.  */
       while (1)
-        {
-          switch (*++f)
-            {
-              /* This influences the number formats.  */
-            case L_('_'):
-            case L_('-'):
-            case L_('0'):
-              pad = *f;
-              continue;
-
-              /* This changes textual output.  */
-            case L_('^'):
-              to_uppcase = 1;
-              continue;
-            case L_('#'):
-              change_case = 1;
-              continue;
-
-            default:
-              break;
-            }
-          break;
-        }
+	{
+	  switch (*++f)
+	    {
+	      /* This influences the number formats.  */
+	    case L_('_'):
+	    case L_('-'):
+	    case L_('0'):
+	      pad = *f;
+	      continue;
+
+	      /* This changes textual output.  */
+	    case L_('^'):
+	      to_uppcase = 1;
+	      continue;
+	    case L_('#'):
+	      change_case = 1;
+	      continue;
+
+	    default:
+	      break;
+	    }
+	  break;
+	}
 
       /* As a GNU extension we allow to specify the field width.  */
       if (ISDIGIT (*f))
-        {
-          width = 0;
-          do
-            {
-              width *= 10;
-              width += *f - L_('0');
-              ++f;
-            }
-          while (ISDIGIT (*f));
-        }
+	{
+	  width = 0;
+	  do
+	    {
+	      if (width > INT_MAX / 10
+		  || (width == INT_MAX / 10 && *f - L_('0') > INT_MAX % 10))
+		/* Avoid overflow.  */
+		width = INT_MAX;
+	      else
+		{
+		  width *= 10;
+		  width += *f - L_('0');
+		}
+	      ++f;
+	    }
+	  while (ISDIGIT (*f));
+	}
 
       /* Check for modifiers.  */
       switch (*f)
-        {
-        case L_('E'):
-        case L_('O'):
-          modifier = *f++;
-          break;
+	{
+	case L_('E'):
+	case L_('O'):
+	  modifier = *f++;
+	  break;
 
-        default:
-          modifier = 0;
-          break;
-        }
+	default:
+	  modifier = 0;
+	  break;
+	}
 
       /* Now do the specified format.  */
       format_char = *f;
       switch (format_char)
-        {
+	{
 #define DO_NUMBER(d, v) \
-          digits = width == -1 ? d : width;                                   \
-          number_value = v; goto do_number
+	  digits = d > width ? d : width;				      \
+	  number_value = v; goto do_number
 #define DO_NUMBER_SPACEPAD(d, v) \
-          digits = width == -1 ? d : width;                                   \
-          number_value = v; goto do_number_spacepad
-
-        case L_('%'):
-          if (modifier != 0)
-            goto bad_format;
-          add (1, *p = *f);
-          break;
-
-        case L_('a'):
-          if (modifier != 0)
-            goto bad_format;
-          if (change_case)
-            {
-              to_uppcase = 1;
-              to_lowcase = 0;
-            }
+	  digits = d > width ? d : width;				      \
+	  number_value = v; goto do_number_spacepad
+
+	case L_('%'):
+	  if (modifier != 0)
+	    goto bad_format;
+	  add (1, *p = *f);
+	  break;
+
+	case L_('a'):
+	  if (modifier != 0)
+	    goto bad_format;
+	  if (change_case)
+	    {
+	      to_uppcase = 1;
+	      to_lowcase = 0;
+	    }
 #if defined _NL_CURRENT || !HAVE_STRFTIME
-          cpy (aw_len, a_wkday);
-          break;
+	  cpy (aw_len, a_wkday);
+	  break;
 #else
-          goto underlying_strftime;
+	  goto underlying_strftime;
 #endif
 
-        case 'A':
-          if (modifier != 0)
-            goto bad_format;
-          if (change_case)
-            {
-              to_uppcase = 1;
-              to_lowcase = 0;
-            }
+	case 'A':
+	  if (modifier != 0)
+	    goto bad_format;
+	  if (change_case)
+	    {
+	      to_uppcase = 1;
+	      to_lowcase = 0;
+	    }
 #if defined _NL_CURRENT || !HAVE_STRFTIME
-          cpy (STRLEN (f_wkday), f_wkday);
-          break;
+	  cpy (STRLEN (f_wkday), f_wkday);
+	  break;
 #else
-          goto underlying_strftime;
+	  goto underlying_strftime;
 #endif
 
-        case L_('b'):
-        case L_('h'):           /* POSIX.2 extension.  */
-          if (change_case)
-            {
-              to_uppcase = 1;
-              to_lowcase = 0;
-            }
-          if (modifier != 0)
-            goto bad_format;
+	case L_('b'):
+	case L_('h'):
+	  if (change_case)
+	    {
+	      to_uppcase = 1;
+	      to_lowcase = 0;
+	    }
+	  if (modifier != 0)
+	    goto bad_format;
 #if defined _NL_CURRENT || !HAVE_STRFTIME
-          cpy (am_len, a_month);
-          break;
+	  cpy (am_len, a_month);
+	  break;
 #else
-          goto underlying_strftime;
+	  goto underlying_strftime;
 #endif
 
-        case L_('B'):
-          if (modifier != 0)
-            goto bad_format;
-          if (change_case)
-            {
-              to_uppcase = 1;
-              to_lowcase = 0;
-            }
+	case L_('B'):
+	  if (modifier != 0)
+	    goto bad_format;
+	  if (change_case)
+	    {
+	      to_uppcase = 1;
+	      to_lowcase = 0;
+	    }
 #if defined _NL_CURRENT || !HAVE_STRFTIME
-          cpy (STRLEN (f_month), f_month);
-          break;
+	  cpy (STRLEN (f_month), f_month);
+	  break;
 #else
-          goto underlying_strftime;
+	  goto underlying_strftime;
 #endif
 
-        case L_('c'):
-          if (modifier == L_('O'))
-            goto bad_format;
+	case L_('c'):
+	  if (modifier == L_('O'))
+	    goto bad_format;
 #ifdef _NL_CURRENT
-          if (! (modifier == 'E'
-                 && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-                                                        NLW(ERA_D_T_FMT)))
-                     != '\0')))
-            subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT));
+	  if (! (modifier == 'E'
+		 && (*(subfmt =
+		       (const CHAR_T *) _NL_CURRENT (LC_TIME,
+						     NLW(ERA_D_T_FMT)))
+		     != '\0')))
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT));
 #else
 # if HAVE_STRFTIME
-          goto underlying_strftime;
+	  goto underlying_strftime;
 # else
-          subfmt = L_("%a %b %e %H:%M:%S %Y");
+	  subfmt = L_("%a %b %e %H:%M:%S %Y");
 # endif
 #endif
 
-        subformat:
-          {
-            CHAR_T *old_start = p;
-            size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp, 0);
-            add (len, my_strftime (p, maxsize - i, subfmt, tp, 0));
-
-            if (to_uppcase)
-              while (old_start < p)
-                {
-                  *old_start = TOUPPER ((UCHAR_T) *old_start);
-                  ++old_start;
-                }
-          }
-          break;
+	subformat:
+	  {
+	    CHAR_T *old_start = p;
+	    size_t len = my_strftime (NULL, (size_t) -1, subfmt,
+				      tp extra_args LOCALE_ARG);
+	    add (len, my_strftime (p, maxsize - i, subfmt,
+				   tp extra_args LOCALE_ARG));
+
+	    if (to_uppcase)
+	      while (old_start < p)
+		{
+		  *old_start = TOUPPER ((UCHAR_T) *old_start, loc);
+		  ++old_start;
+		}
+	  }
+	  break;
 
 #if HAVE_STRFTIME && ! (defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY)
-        underlying_strftime:
-          {
-            /* The relevant information is available only via the
-               underlying strftime implementation, so use that.  */
-            char ufmt[4];
-            char *u = ufmt;
-            char ubuf[1024]; /* enough for any single format in practice */
-            size_t len;
-            /* Make sure we're calling the actual underlying strftime.
-               In some cases, config.h contains something like
-               "#define strftime rpl_strftime".  */
+	underlying_strftime:
+	  {
+	    /* The relevant information is available only via the
+	       underlying strftime implementation, so use that.  */
+	    char ufmt[4];
+	    char *u = ufmt;
+	    char ubuf[1024]; /* enough for any single format in practice */
+	    size_t len;
+	    /* Make sure we're calling the actual underlying strftime.
+	       In some cases, config.h contains something like
+	       "#define strftime rpl_strftime".  */
 # ifdef strftime
 #  undef strftime
-            size_t strftime ();
+	    size_t strftime ();
 # endif
 
 #ifdef STRFTIME_NO_POSIX2
@@ -860,530 +927,567 @@ my_strftime (s, maxsize, format, tp ut_argument)
           break;
 #endif
 
-        case L_('C'):           /* POSIX.2 extension.  */
+        case L_('C'):
           if (modifier == L_('O'))
             goto bad_format;
           if (modifier == L_('E'))
             {
 #if HAVE_STRUCT_ERA_ENTRY
-              struct era_entry *era = _nl_get_era_entry (tp);
-              if (era)
-                {
+	      struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);
+	      if (era)
+		{
 # ifdef COMPILE_WIDE
-                  size_t len = __wcslen (era->era_wname);
-                  cpy (len, era->era_wname);
+		  size_t len = __wcslen (era->era_wname);
+		  cpy (len, era->era_wname);
 # else
-                  size_t len = strlen (era->era_name);
-                  cpy (len, era->era_name);
+		  size_t len = strlen (era->era_name);
+		  cpy (len, era->era_name);
 # endif
-                  break;
-                }
+		  break;
+		}
 #else
 # if HAVE_STRFTIME
-              goto underlying_strftime;
+	      goto underlying_strftime;
 # endif
 #endif
-            }
+	    }
 
-          {
-            int year = tp->tm_year + TM_YEAR_BASE;
-            DO_NUMBER (1, year / 100 - (year % 100 < 0));
-          }
+	  {
+	    int year = tp->tm_year + TM_YEAR_BASE;
+	    DO_NUMBER (1, year / 100 - (year % 100 < 0));
+	  }
 
-        case L_('x'):
-          if (modifier == L_('O'))
-            goto bad_format;
+	case L_('x'):
+	  if (modifier == L_('O'))
+	    goto bad_format;
 #ifdef _NL_CURRENT
-          if (! (modifier == L_('E')
-                 && (*(subfmt = (CHAR_T *)_NL_CURRENT (LC_TIME,
-                                                       NLW(ERA_D_FMT)))
-                     != L_('\0'))))
-            subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
-          goto subformat;
+	  if (! (modifier == L_('E')
+		 && (*(subfmt =
+		       (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT)))
+		     != L_('\0'))))
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
+	  goto subformat;
 #else
 # if HAVE_STRFTIME
-          goto underlying_strftime;
+	  goto underlying_strftime;
 # else
-          /* Fall through.  */
+	  /* Fall through.  */
 # endif
 #endif
-        case L_('D'):           /* POSIX.2 extension.  */
-          if (modifier != 0)
-            goto bad_format;
-          subfmt = L_("%m/%d/%y");
-          goto subformat;
+	case L_('D'):
+	  if (modifier != 0)
+	    goto bad_format;
+	  subfmt = L_("%m/%d/%y");
+	  goto subformat;
 
-        case L_('d'):
-          if (modifier == L_('E'))
-            goto bad_format;
+	case L_('d'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
 
-          DO_NUMBER (2, tp->tm_mday);
+	  DO_NUMBER (2, tp->tm_mday);
 
-        case L_('e'):           /* POSIX.2 extension.  */
-          if (modifier == L_('E'))
-            goto bad_format;
+	case L_('e'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
 
-          DO_NUMBER_SPACEPAD (2, tp->tm_mday);
+	  DO_NUMBER_SPACEPAD (2, tp->tm_mday);
 
-          /* All numeric formats set DIGITS and NUMBER_VALUE and then
-             jump to one of these two labels.  */
+	  /* All numeric formats set DIGITS and NUMBER_VALUE and then
+	     jump to one of these two labels.  */
 
-        do_number_spacepad:
-          /* Force `_' flag unless overwritten by `0' flag.  */
-          if (pad != L_('0'))
-            pad = L_('_');
+	do_number_spacepad:
+	  /* Force `_' flag unless overridden by `0' or `-' flag.  */
+	  if (pad != L_('0') && pad != L_('-'))
+	    pad = L_('_');
 
-        do_number:
-          /* Format the number according to the MODIFIER flag.  */
+	do_number:
+	  /* Format the number according to the MODIFIER flag.  */
 
-          if (modifier == L_('O') && 0 <= number_value)
-            {
+	  if (modifier == L_('O') && 0 <= number_value)
+	    {
 #ifdef _NL_CURRENT
-              /* Get the locale specific alternate representation of
-                 the number NUMBER_VALUE.  If none exist NULL is returned.  */
-# ifdef COMPILE_WIDE
-              const wchar_t *cp = _nl_get_walt_digit (number_value);
-# else
-              const char *cp = _nl_get_alt_digit (number_value);
-# endif
-
-              if (cp != NULL)
-                {
-                  size_t digitlen = STRLEN (cp);
-                  if (digitlen != 0)
-                    {
-                      cpy (digitlen, cp);
-                      break;
-                    }
-                }
+	      /* Get the locale specific alternate representation of
+		 the number NUMBER_VALUE.  If none exist NULL is returned.  */
+	      const CHAR_T *cp = nl_get_alt_digit (number_value
+						   HELPER_LOCALE_ARG);
+
+	      if (cp != NULL)
+		{
+		  size_t digitlen = STRLEN (cp);
+		  if (digitlen != 0)
+		    {
+		      cpy (digitlen, cp);
+		      break;
+		    }
+		}
 #else
 # if HAVE_STRFTIME
-              goto underlying_strftime;
+	      goto underlying_strftime;
 # endif
 #endif
-            }
-          {
-            unsigned int u = number_value;
-
-            bufp = buf + sizeof (buf) / sizeof (buf[0]);
-            negative_number = number_value < 0;
-
-            if (negative_number)
-              u = -u;
-
-            do
-              *--bufp = u % 10 + L_('0');
-            while ((u /= 10) != 0);
-          }
-
-        do_number_sign_and_padding:
-          if (negative_number)
-            *--bufp = L_('-');
-
-          if (pad != L_('-'))
-            {
-              int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0]))
-                                      - bufp);
-
-              if (pad == L_('_'))
-                {
-                  while (0 < padding--)
-                    *--bufp = L_(' ');
-                }
-              else
-                {
-                  bufp += negative_number;
-                  while (0 < padding--)
-                    *--bufp = L_('0');
-                  if (negative_number)
-                    *--bufp = L_('-');
-                }
-            }
-
-          cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp);
-          break;
-
-        case L_('F'):
-          if (modifier != 0)
-            goto bad_format;
-          subfmt = L_("%Y-%m-%d");
-          goto subformat;
+	    }
+	  {
+	    unsigned int u = number_value;
+
+	    bufp = buf + sizeof (buf) / sizeof (buf[0]);
+	    negative_number = number_value < 0;
 
-        case L_('H'):
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER (2, tp->tm_hour);
-
-        case L_('I'):
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER (2, hour12);
-
-        case L_('k'):           /* GNU extension.  */
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER_SPACEPAD (2, tp->tm_hour);
-
-        case L_('l'):           /* GNU extension.  */
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER_SPACEPAD (2, hour12);
-
-        case L_('j'):
-          if (modifier == L_('E'))
-            goto bad_format;
+	    if (negative_number)
+	      u = -u;
 
-          DO_NUMBER (3, 1 + tp->tm_yday);
+	    do
+	      *--bufp = u % 10 + L_('0');
+	    while ((u /= 10) != 0);
+  	  }
 
-        case L_('M'):
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER (2, tp->tm_min);
-
-        case L_('m'):
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER (2, tp->tm_mon + 1);
+	do_number_sign_and_padding:
+	  if (negative_number)
+	    *--bufp = L_('-');
+
+	  if (pad != L_('-'))
+	    {
+	      int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0]))
+				      - bufp);
+
+	      if (padding > 0)
+		{
+		  if (pad == L_('_'))
+		    {
+		      if ((size_t) padding >= maxsize - i)
+			return 0;
+
+		      if (p)
+			memset_space (p, padding);
+		      i += padding;
+		      width = width > padding ? width - padding : 0;
+		    }
+		  else
+		    {
+		      if ((size_t) digits >= maxsize - i)
+			return 0;
+
+		      if (negative_number)
+			{
+			  ++bufp;
+
+			  if (p)
+			    *p++ = L_('-');
+			  ++i;
+			}
+
+		      if (p)
+			memset_zero (p, padding);
+		      i += padding;
+		      width = 0;
+		    }
+		}
+	    }
+
+	  cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp);
+	  break;
+
+	case L_('F'):
+	  if (modifier != 0)
+	    goto bad_format;
+	  subfmt = L_("%Y-%m-%d");
+	  goto subformat;
+
+	case L_('H'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (2, tp->tm_hour);
+
+	case L_('I'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (2, hour12);
+
+	case L_('k'):		/* GNU extension.  */
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER_SPACEPAD (2, tp->tm_hour);
+
+	case L_('l'):		/* GNU extension.  */
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER_SPACEPAD (2, hour12);
+
+	case L_('j'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (3, 1 + tp->tm_yday);
+
+	case L_('M'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (2, tp->tm_min);
+
+	case L_('m'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (2, tp->tm_mon + 1);
+
+#ifndef _LIBC
+	case L_('N'):		/* GNU extension.  */
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  number_value = ns;
+	  if (width != -1)
+	    {
+	      /* Take an explicit width less than 9 as a precision.  */
+	      int j;
+	      for (j = width; j < 9; j++)
+		number_value /= 10;
+	    }
+
+	  DO_NUMBER (9, number_value);
+#endif
 
-        case L_('n'):           /* POSIX.2 extension.  */
-          add (1, *p = L_('\n'));
-          break;
+	case L_('n'):
+	  add (1, *p = L_('\n'));
+	  break;
 
-        case L_('P'):
-          to_lowcase = 1;
+	case L_('P'):
+	  to_lowcase = 1;
 #if !defined _NL_CURRENT && HAVE_STRFTIME
-          format_char = L_('p');
+	  format_char = L_('p');
 #endif
-          /* FALLTHROUGH */
-
-        case L_('p'):
-          if (change_case)
-            {
-              to_uppcase = 0;
-              to_lowcase = 1;
-            }
+	  /* FALLTHROUGH */
+
+	case L_('p'):
+	  if (change_case)
+	    {
+	      to_uppcase = 0;
+	      to_lowcase = 1;
+	    }
 #if defined _NL_CURRENT || !HAVE_STRFTIME
-          cpy (ap_len, ampm);
-          break;
+	  cpy (ap_len, ampm);
+	  break;
 #else
-          goto underlying_strftime;
+	  goto underlying_strftime;
 #endif
 
-        case L_('R'):           /* GNU extension.  */
-          subfmt = L_("%H:%M");
-          goto subformat;
+	case L_('R'):
+	  subfmt = L_("%H:%M");
+	  goto subformat;
 
-        case L_('r'):           /* POSIX.2 extension.  */
+	case L_('r'):
 #ifdef _NL_CURRENT
-          if (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-                                                 NLW(T_FMT_AMPM))) == L_('\0'))
+	  if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME,
+						       NLW(T_FMT_AMPM)))
+	      == L_('\0'))
 #endif
-            subfmt = L_("%I:%M:%S %p");
-          goto subformat;
+	    subfmt = L_("%I:%M:%S %p");
+	  goto subformat;
 
-        case L_('S'):
-          if (modifier == L_('E'))
-            goto bad_format;
+	case L_('S'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
 
-          DO_NUMBER (2, tp->tm_sec);
+	  DO_NUMBER (2, tp->tm_sec);
 
-        case L_('s'):           /* GNU extension.  */
-          {
-            struct tm ltm;
-            time_t t;
+	case L_('s'):		/* GNU extension.  */
+  	  {
+	    struct tm ltm;
+	    time_t t;
 
-            ltm = *tp;
-            t = mktime (&ltm);
+	    ltm = *tp;
+	    t = mktime (&ltm);
 
-            /* Generate string value for T using time_t arithmetic;
-               this works even if sizeof (long) < sizeof (time_t).  */
+	    /* Generate string value for T using time_t arithmetic;
+	       this works even if sizeof (long) < sizeof (time_t).  */
 
-            bufp = buf + sizeof (buf) / sizeof (buf[0]);
-            negative_number = t < 0;
+	    bufp = buf + sizeof (buf) / sizeof (buf[0]);
+	    negative_number = t < 0;
 
-            do
-              {
-                int d = t % 10;
-                t /= 10;
+	    do
+	      {
+		int d = t % 10;
+		t /= 10;
 
-                if (negative_number)
-                  {
-                    d = -d;
+		if (negative_number)
+		  {
+		    d = -d;
 
-                    /* Adjust if division truncates to minus infinity.  */
-                    if (0 < -1 % 10 && d < 0)
-                      {
-                        t++;
-                        d += 10;
-                      }
-                  }
+		    /* Adjust if division truncates to minus infinity.  */
+		    if (0 < -1 % 10 && d < 0)
+		      {
+			t++;
+			d += 10;
+		      }
+		  }
 
-                *--bufp = d + L_('0');
-              }
-            while (t != 0);
+		*--bufp = d + L_('0');
+	      }
+	    while (t != 0);
 
-            digits = 1;
-            goto do_number_sign_and_padding;
-          }
+	    digits = 1;
+	    goto do_number_sign_and_padding;
+	  }
 
-        case L_('X'):
-          if (modifier == L_('O'))
-            goto bad_format;
+	case L_('X'):
+	  if (modifier == L_('O'))
+	    goto bad_format;
 #ifdef _NL_CURRENT
-          if (! (modifier == L_('E')
-                 && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-                                                        NLW(ERA_T_FMT)))
-                     != L_('\0'))))
-            subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT));
-          goto subformat;
+	  if (! (modifier == L_('E')
+		 && (*(subfmt =
+		       (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_T_FMT)))
+		     != L_('\0'))))
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT));
+	  goto subformat;
 #else
 # if HAVE_STRFTIME
-          goto underlying_strftime;
+	  goto underlying_strftime;
 # else
-          /* Fall through.  */
+	  /* Fall through.  */
 # endif
 #endif
-        case L_('T'):           /* POSIX.2 extension.  */
-          subfmt = L_("%H:%M:%S");
-          goto subformat;
-
-        case L_('t'):           /* POSIX.2 extension.  */
-          add (1, *p = L_('\t'));
-          break;
-
-        case L_('u'):           /* POSIX.2 extension.  */
-          DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
-
-        case L_('U'):
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7);
-
-        case L_('V'):
-        case L_('g'):           /* GNU extension.  */
-        case L_('G'):           /* GNU extension.  */
-          if (modifier == L_('E'))
-            goto bad_format;
-          {
-            int year = tp->tm_year + TM_YEAR_BASE;
-            int days = iso_week_days (tp->tm_yday, tp->tm_wday);
-
-            if (days < 0)
-              {
-                /* This ISO week belongs to the previous year.  */
-                year--;
-                days = iso_week_days (tp->tm_yday + (365 + __isleap (year)),
-                                      tp->tm_wday);
-              }
-            else
-              {
-                int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)),
-                                       tp->tm_wday);
-                if (0 <= d)
-                  {
-                    /* This ISO week belongs to the next year.  */
-                    year++;
-                    days = d;
-                  }
-              }
-
-            switch (*f)
-              {
-              case L_('g'):
-                DO_NUMBER (2, (year % 100 + 100) % 100);
-
-              case L_('G'):
-                DO_NUMBER (1, year);
-
-              default:
-                DO_NUMBER (2, days / 7 + 1);
-              }
-          }
-
-        case L_('W'):
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7);
-
-        case L_('w'):
-          if (modifier == L_('E'))
-            goto bad_format;
-
-          DO_NUMBER (1, tp->tm_wday);
-
-        case L_('Y'):
-          if (modifier == 'E')
-            {
+	case L_('T'):
+	  subfmt = L_("%H:%M:%S");
+	  goto subformat;
+
+	case L_('t'):
+	  add (1, *p = L_('\t'));
+	  break;
+
+	case L_('u'):
+	  DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
+
+	case L_('U'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7);
+
+	case L_('V'):
+	case L_('g'):
+	case L_('G'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+	  {
+	    int year = tp->tm_year + TM_YEAR_BASE;
+	    int days = iso_week_days (tp->tm_yday, tp->tm_wday);
+
+	    if (days < 0)
+	      {
+		/* This ISO week belongs to the previous year.  */
+		year--;
+		days = iso_week_days (tp->tm_yday + (365 + __isleap (year)),
+				      tp->tm_wday);
+	      }
+	    else
+	      {
+		int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)),
+				       tp->tm_wday);
+		if (0 <= d)
+		  {
+		    /* This ISO week belongs to the next year.  */
+		    year++;
+		    days = d;
+		  }
+	      }
+
+	    switch (*f)
+	      {
+	      case L_('g'):
+		DO_NUMBER (2, (year % 100 + 100) % 100);
+
+	      case L_('G'):
+		DO_NUMBER (1, year);
+
+	      default:
+		DO_NUMBER (2, days / 7 + 1);
+	      }
+	  }
+
+	case L_('W'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7);
+
+	case L_('w'):
+	  if (modifier == L_('E'))
+	    goto bad_format;
+
+	  DO_NUMBER (1, tp->tm_wday);
+
+	case L_('Y'):
+	  if (modifier == 'E')
+	    {
 #if HAVE_STRUCT_ERA_ENTRY
-              struct era_entry *era = _nl_get_era_entry (tp);
-              if (era)
-                {
+	      struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);
+	      if (era)
+		{
 # ifdef COMPILE_WIDE
-                  subfmt = era->era_wformat;
+		  subfmt = era->era_wformat;
 # else
-                  subfmt = era->era_format;
+		  subfmt = era->era_format;
 # endif
-                  goto subformat;
-                }
+		  goto subformat;
+		}
 #else
 # if HAVE_STRFTIME
-              goto underlying_strftime;
+	      goto underlying_strftime;
 # endif
 #endif
-            }
-          if (modifier == L_('O'))
-            goto bad_format;
-          else
-            DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE);
-
-        case L_('y'):
-          if (modifier == L_('E'))
-            {
+	    }
+	  if (modifier == L_('O'))
+	    goto bad_format;
+	  else
+	    DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE);
+
+	case L_('y'):
+	  if (modifier == L_('E'))
+	    {
 #if HAVE_STRUCT_ERA_ENTRY
-              struct era_entry *era = _nl_get_era_entry (tp);
-              if (era)
-                {
-                  int delta = tp->tm_year - era->start_date[0];
-                  DO_NUMBER (1, (era->offset
-                                 + delta * era->absolute_direction));
-                }
+	      struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);
+	      if (era)
+		{
+		  int delta = tp->tm_year - era->start_date[0];
+		  DO_NUMBER (1, (era->offset
+				 + delta * era->absolute_direction));
+		}
 #else
 # if HAVE_STRFTIME
-              goto underlying_strftime;
+	      goto underlying_strftime;
 # endif
 #endif
-            }
-          DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100);
+	    }
+	  DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100);
 
-        case L_('Z'):
-          if (change_case)
-            {
-              to_uppcase = 0;
-              to_lowcase = 1;
-            }
+	case L_('Z'):
+	  if (change_case)
+	    {
+	      to_uppcase = 0;
+	      to_lowcase = 1;
+	    }
 
 #if HAVE_TZNAME
-          /* The tzset() call might have changed the value.  */
-          if (!(zone && *zone) && tp->tm_isdst >= 0)
-            zone = tzname[tp->tm_isdst];
+	  /* The tzset() call might have changed the value.  */
+	  if (!(zone && *zone) && tp->tm_isdst >= 0)
+	    zone = tzname[tp->tm_isdst];
 #endif
-          if (! zone)
-            zone = "";          /* POSIX.2 requires the empty string here.  */
+	  if (! zone)
+	    zone = "";
 
 #ifdef COMPILE_WIDE
-          {
-            /* The zone string is always given in multibyte form.  We have
-               to transform it first.  */
-            wchar_t *wczone;
-            size_t len;
-            widen (zone, wczone, len);
-            cpy (len, wczone);
-          }
+	  {
+	    /* The zone string is always given in multibyte form.  We have
+	       to transform it first.  */
+	    wchar_t *wczone;
+	    size_t len;
+	    widen (zone, wczone, len);
+	    cpy (len, wczone);
+	  }
 #else
-          cpy (strlen (zone), zone);
+	  cpy (strlen (zone), zone);
 #endif
-          break;
+	  break;
 
-        case L_('z'):           /* GNU extension.  */
-          if (tp->tm_isdst < 0)
-            break;
+	case L_('z'):
+	  if (tp->tm_isdst < 0)
+	    break;
 
-          {
-            int diff;
+	  {
+	    int diff;
 #if HAVE_TM_GMTOFF
-            diff = tp->tm_gmtoff;
+	    diff = tp->tm_gmtoff;
 #else
-            if (ut)
-              diff = 0;
-            else
-              {
-                struct tm gtm;
-                struct tm ltm;
-                time_t lt;
-
-                ltm = *tp;
-                lt = mktime (&ltm);
-
-                if (lt == (time_t) -1)
-                  {
-                    /* mktime returns -1 for errors, but -1 is also a
-                       valid time_t value.  Check whether an error really
-                       occurred.  */
-                    struct tm tm;
-
-                    if (! my_strftime_localtime_r (&lt, &tm)
-                        || ((ltm.tm_sec ^ tm.tm_sec)
-                            | (ltm.tm_min ^ tm.tm_min)
-                            | (ltm.tm_hour ^ tm.tm_hour)
-                            | (ltm.tm_mday ^ tm.tm_mday)
-                            | (ltm.tm_mon ^ tm.tm_mon)
-                            | (ltm.tm_year ^ tm.tm_year)))
-                      break;
-                  }
-
-                if (! my_strftime_gmtime_r (&lt, &gtm))
-                  break;
-
-                diff = tm_diff (&ltm, &gtm);
-              }
+	    if (ut)
+	      diff = 0;
+	    else
+	      {
+		struct tm gtm;
+		struct tm ltm;
+		time_t lt;
+
+		ltm = *tp;
+		lt = mktime (&ltm);
+
+		if (lt == (time_t) -1)
+		  {
+		    /* mktime returns -1 for errors, but -1 is also a
+		       valid time_t value.  Check whether an error really
+		       occurred.  */
+		    struct tm tm;
+
+		    if (! my_strftime_localtime_r (&lt, &tm)
+			|| ((ltm.tm_sec ^ tm.tm_sec)
+			    | (ltm.tm_min ^ tm.tm_min)
+			    | (ltm.tm_hour ^ tm.tm_hour)
+			    | (ltm.tm_mday ^ tm.tm_mday)
+			    | (ltm.tm_mon ^ tm.tm_mon)
+			    | (ltm.tm_year ^ tm.tm_year)))
+		      break;
+		  }
+
+		if (! my_strftime_gmtime_r (&lt, &gtm))
+		  break;
+
+		diff = tm_diff (&ltm, &gtm);
+	      }
 #endif
 
-            if (diff < 0)
-              {
-                add (1, *p = L_('-'));
-                diff = -diff;
-              }
-            else
-              add (1, *p = L_('+'));
-
-            diff /= 60;
-            DO_NUMBER (4, (diff / 60) * 100 + diff % 60);
-          }
-
-        case L_('\0'):          /* GNU extension: % at end of format.  */
-            --f;
-            /* Fall through.  */
-        default:
-          /* Unknown format; output the format, including the '%',
-             since this is most likely the right thing to do if a
-             multibyte string has been misparsed.  */
-        bad_format:
-          {
-            int flen;
-            for (flen = 1; f[1 - flen] != L_('%'); flen++)
-              continue;
-            cpy (flen, &f[1 - flen]);
-          }
-          break;
-        }
+	    if (diff < 0)
+	      {
+		add (1, *p = L_('-'));
+		diff = -diff;
+	      }
+	    else
+	      add (1, *p = L_('+'));
+
+	    diff /= 60;
+	    DO_NUMBER (4, (diff / 60) * 100 + diff % 60);
+	  }
+
+	case L_('\0'):		/* GNU extension: % at end of format.  */
+	    --f;
+	    /* Fall through.  */
+	default:
+	  /* Unknown format; output the format, including the '%',
+	     since this is most likely the right thing to do if a
+	     multibyte string has been misparsed.  */
+	bad_format:
+	  {
+	    int flen;
+	    for (flen = 1; f[1 - flen] != L_('%'); flen++)
+	      continue;
+	    cpy (flen, &f[1 - flen]);
+	  }
+	  break;
+	}
     }
 
   if (p && maxsize != 0)
     *p = L_('\0');
   return i;
 }
+#ifdef _LIBC
+libc_hidden_def (my_strftime)
+#endif
 
 
 #ifdef emacs
+#undef ut
 /* For Emacs we have a separate interface which corresponds to the normal
-   strftime function and does not have the extra information whether the
-   TP arguments comes from a `gmtime' call or not.  */
+   strftime function plus the ut argument, but without the ns argument.  */
 size_t
-emacs_strftime (s, maxsize, format, tp)
+emacs_strftimeu (s, maxsize, format, tp, ut)
       char *s;
       size_t maxsize;
       const char *format;
       const struct tm *tp;
+      int ut;
 {
-  return my_strftime (s, maxsize, format, tp, 0);
+  return my_strftime (s, maxsize, format, tp, ut, 0);
 }
 #endif
-