2005-11-18 Jeff Johnston <jjohnstn@redhat.com>

* libc/time/strptime.c (strptime): Don't abort for %c and %Z.
        Treat %c as "%a %b %e %H:%M:%S %Y" and ignore %Z.
This commit is contained in:
Jeff Johnston 2005-11-18 19:00:29 +00:00
parent 19e7c3a068
commit 6b1a6ec67b
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2005-11-18 Jeff Johnston <jjohnstn@redhat.com>
* libc/time/strptime.c (strptime): Don't abort for %c and %Z.
Treat %c as "%a %b %e %H:%M:%S %Y" and ignore %Z.
2005-11-18 Christopher Faylor <cgf@timesys.com>
* include/sys/time.h: Move more cygwin stuff to cygwin-specific header.

View File

@ -249,8 +249,12 @@ _DEFUN (strptime, (buf, format, timeptr),
timeptr->tm_year = (ret * 100) - tm_year_base;
buf = s;
break;
case 'c' :
abort ();
case 'c' : /* %a %b %e %H:%M:%S %Y */
s = strptime (buf, "%a %b %e %H:%M:%S %Y", timeptr);
if (s == NULL)
return NULL;
buf = s;
break;
case 'D' : /* %m/%d/%y */
s = strptime (buf, "%m/%d/%y", timeptr);
if (s == NULL)
@ -412,7 +416,8 @@ _DEFUN (strptime, (buf, format, timeptr),
buf = s;
break;
case 'Z' :
abort ();
/* Unsupported. Just ignore. */
break;
case '\0' :
--format;
/* FALLTHROUGH */