diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-08 18:01:43 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-08 18:01:52 +0000 |
| commit | 7e7abd4d4c78353590cf18476fa374ff2e3e7176 (patch) | |
| tree | a50dc16a2f855d242ddc383f207b051c8b23d546 /usr/src/lib/libc | |
| parent | 6ca718aa15285e34a516d3fae4b5f3e80a2f9240 (diff) | |
| parent | ee169c7e77bc5d28a401dde8533cbd38afd24ae1 (diff) | |
| download | illumos-joyent-7e7abd4d4c78353590cf18476fa374ff2e3e7176.tar.gz | |
[illumos-gate merge]20140109release-20140109
commit ee169c7e77bc5d28a401dde8533cbd38afd24ae1
4378 Clean up %C in *time() functions
438 need documentation for strftime %s flag
Conflicts:
usr/src/lib/print/libpapi-common/common/attribute.c (deleted)
usr/src/cmd/cron/cron.c (copyright)
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/gen/cftime.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/lib/libc/port/gen/cftime.c b/usr/src/lib/libc/port/gen/cftime.c index f4fa872da8..be0a67c75d 100644 --- a/usr/src/lib/libc/port/gen/cftime.c +++ b/usr/src/lib/libc/port/gen/cftime.c @@ -20,6 +20,8 @@ */ /* + * Copyright (c) 2014 Gary Mills + * * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +29,6 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This routine converts time as follows. The epoch is 0000 Jan 1 * 1970 GMT. The argument time is in seconds since then. The @@ -91,7 +91,7 @@ ascftime(char *buf, const char *format, const struct tm *tm) /* Set format string, if not already set */ if (format == NULL || *format == '\0') if (((format = getenv("CFTIME")) == 0) || *format == 0) - format = "%C"; + format = "%+"; return ((int)strftime(buf, LONG_MAX, format, tm)); } |