From: Jim Meyering <jim@meyering.net>
Date: Thu, 29 May 2003 12:09:06 +0000 (+0000)
Subject: Make the %r format directive honor any locale setting.
X-Git-Tag: v5.0.1~435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efc545bd54e20f47a74f05d8ccdc5e311036d8f0;p=thirdparty%2Fcoreutils.git

Make the %r format directive honor any locale setting.

(my_strftime) [!defined _NL_CURRENT && HAVE_STRFTIME]:
Use underlying_strftime for %r.
---

diff --git a/lib/strftime.c b/lib/strftime.c
index 52e84e322a..fabb265308 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -1171,13 +1171,17 @@ my_strftime (s, maxsize, format, tp extra_args LOCALE_PARAM)
 	  goto subformat;
 
 	case L_('r'):
-#ifdef _NL_CURRENT
+#if !defined _NL_CURRENT && HAVE_STRFTIME
+	  goto underlying_strftime;
+#else
+# ifdef _NL_CURRENT
 	  if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME,
 						       NLW(T_FMT_AMPM)))
 	      == L_('\0'))
-#endif
+# endif
 	    subfmt = L_("%I:%M:%S %p");
 	  goto subformat;
+#endif
 
 	case L_('S'):
 	  if (modifier == L_('E'))