summaryrefslogtreecommitdiff
path: root/lib/strftime.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-08-30 07:58:01 +0000
committerJim Meyering <jim@meyering.net>2000-08-30 07:58:01 +0000
commit048aa98ba87ab3749baa23260161b312d13c27b5 (patch)
tree2e154bb6b568db641abccac634fe0a37db7d6efb /lib/strftime.c
parent3c5e612fce0d09e02eb82e42d34996cd6c0e33d0 (diff)
downloadcoreutils-048aa98ba87ab3749baa23260161b312d13c27b5.tar.xz
Merge in changes from GNU libc.
Diffstat (limited to 'lib/strftime.c')
-rw-r--r--lib/strftime.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/strftime.c b/lib/strftime.c
index 6ab2be7d4..c3b214860 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -98,8 +98,8 @@ extern char *tzname[];
# define L_(Str) L##Str
# define NLW(Sym) _NL_W##Sym
-# define MEMCPY(d, s, n) wmemcpy (d, s, n)
-# define STRLEN(s) wcslen (s)
+# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
+# define STRLEN(s) __wcslen (s)
#else
# define CHAR_T char
@@ -752,6 +752,11 @@ my_strftime (s, maxsize, format, tp ut_argument)
case L_('b'):
case L_('h'): /* POSIX.2 extension. */
+ if (change_case)
+ {
+ to_uppcase = 1;
+ to_lowcase = 0;
+ }
if (modifier != 0)
goto bad_format;
#if defined _NL_CURRENT || !HAVE_STRFTIME
@@ -848,7 +853,7 @@ my_strftime (s, maxsize, format, tp ut_argument)
if (era)
{
# ifdef COMPILE_WIDE
- size_t len = wcslen (era->era_wname);
+ size_t len = __wcslen (era->era_wname);
cpy (len, era->era_wname);
# else
size_t len = strlen (era->era_name);