JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/time/strftime.c (strftime): Add '%h' and '%l, %k' GNU extensions.

This commit is contained in:
Christopher Faylor 2003-01-15 18:52:02 +00:00
parent 77cb0c56ef
commit 845102177a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-14 Christopher Faylor <cgf@redhat.com>
* libc/time/strftime.c (strftime): Add '%h' and '%l, %k' GNU
extensions.
2003-01-08 Richard Sandiford <rsandifo@redhat.com> 2003-01-08 Richard Sandiford <rsandifo@redhat.com>
* configure.host (mips64vr-elf, mips64vrel-elf): New config. * configure.host (mips64vr-elf, mips64vrel-elf): New config.

7
newlib/libc/time/strftime.c
View File

@ -209,6 +209,7 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
} }
break; break;
case 'b': case 'b':
case 'h':
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
if (count < maxsize - 1) if (count < maxsize - 1)
@ -271,9 +272,10 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
return 0; return 0;
break; break;
case 'H': case 'H':
case 'k':
if (count < maxsize - 2) if (count < maxsize - 2)
{ {
sprintf (&s[count], "%2.2d", sprintf (&s[count], *format == 'k' ? "%2d" : "%2.2d",
tim_p->tm_hour); tim_p->tm_hour);
count += 2; count += 2;
} }
@ -281,6 +283,7 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
return 0; return 0;
break; break;
case 'I': case 'I':
case 'l':
if (count < maxsize - 2) if (count < maxsize - 2)
{ {
if (tim_p->tm_hour == 0 || if (tim_p->tm_hour == 0 ||
@ -291,7 +294,7 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
} }
else else
{ {
sprintf (&s[count], "%.2d", sprintf (&s[count], (*format == 'I') ? "%.2d" : "%2d",
tim_p->tm_hour % 12); tim_p->tm_hour % 12);
count += 2; count += 2;
} }