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/cmd/cron | |
| parent | 6ca718aa15285e34a516d3fae4b5f3e80a2f9240 (diff) | |
| parent | ee169c7e77bc5d28a401dde8533cbd38afd24ae1 (diff) | |
| download | illumos-joyent-release-20140109.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/cmd/cron')
| -rw-r--r-- | usr/src/cmd/cron/cron.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/cmd/cron/cron.c b/usr/src/cmd/cron/cron.c index 8edb18bca9..33a7373f1e 100644 --- a/usr/src/cmd/cron/cron.c +++ b/usr/src/cmd/cron/cron.c @@ -24,6 +24,7 @@ * * Copyright 2013 Joshua M. Clulow <josh@sysmgr.org> * Copyright 2013 Joyent, Inc. All rights reserved. + * Copyright (c) 2014 Gary Mills */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -551,7 +552,7 @@ begin: } else { ne_time = next_event->time - t; #ifdef DEBUG - cftime(timebuf, "%C", &next_event->time); + cftime(timebuf, "%+", &next_event->time); (void) fprintf(stderr, "next_time=%ld %s\n", next_event->time, timebuf); #endif @@ -625,7 +626,7 @@ begin: next_time(next_event, (time_t)0); } #ifdef DEBUG - cftime(timebuf, "%C", &next_event->time); + cftime(timebuf, "%+", &next_event->time); (void) fprintf(stderr, "pushing back cron event %s at %ld (%s)\n", next_event->cmd, next_event->time, timebuf); @@ -1350,7 +1351,7 @@ again: } cte_valid(); #ifdef DEBUG - cftime(timebuf, "%C", &e->time); + cftime(timebuf, "%+", &e->time); (void) fprintf(stderr, "inserting cron event %s at %ld (%s)\n", e->cmd, e->time, timebuf); #endif |