diff options
| author |   d <d@openbsd.org> | 2000-04-16 16:24:03 +0000 |
|---|---|---|
| committer | d <d@openbsd.org> | 2000-04-16 16:24:03 +0000 |
| commit | 169f132f1a1626ae5070633f7778cc6bab8ea276 (patch) | |
| tree | 3a0de039bbe03d386dfbefd3813c89d83eee0874 /lib/libc/time/strftime.c | |
| parent | sync with ftp://elsie.nci.nih.gov/pub/tzdata2000d.tar.gz, ok millert@ (diff) | |
| download | wireguard-openbsd-169f132f1a1626ae5070633f7778cc6bab8ea276.tar.xz wireguard-openbsd-169f132f1a1626ae5070633f7778cc6bab8ea276.zip | |
sync with ftp://elsie.nci.nih.gov/pub/tzcode2000c.tar.gz, millert@ ok
Diffstat (limited to 'lib/libc/time/strftime.c')
| -rw-r--r-- | lib/libc/time/strftime.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c index 321d71fafc1..f005a86a936 100644 --- a/lib/libc/time/strftime.c +++ b/lib/libc/time/strftime.c @@ -1,6 +1,6 @@ #if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID) -static char elsieid[] = "@(#)strftime.c 7.57"; -static char *rcsid = "$OpenBSD: strftime.c,v 1.5 1998/08/14 21:39:44 deraadt Exp $"; +static char elsieid[] = "@(#)strftime.c 7.58"; +static char *rcsid = "$OpenBSD: strftime.c,v 1.6 2000/04/16 16:24:04 d Exp $"; #endif /* LIBC_SCCS and not lint */ #include "private.h" @@ -80,24 +80,21 @@ static const struct lc_time_T C_time_locale = { /* ** x_fmt - ** Since the C language standard calls for - ** "date, using locale's date format," anything goes. + ** C99 requires this format. ** Using just numbers (as here) makes Quakers happier; ** it's also compatible with SVR4. - ** - ** XXX--might it be better to use the year-2000 friendly - ** %Y-%m-%d - ** here? */ "%m/%d/%y", /* ** c_fmt - ** XXX--Changed by millert from "%D %X" - ** to the more common "%a %b %d %H:%M:%S %Y" - ** used by everyone else. + ** C99 requires this format. + ** Previously this code used "%D %X", but we now conform to C99. + ** Note that + ** "%a %b %d %H:%M:%S %Y" + ** is used by Solaris 2.3. */ - "%a %b %d %H:%M:%S %Y", + "%a %b %e %T %Y", /* am */ "AM", |