diff options
Diffstat (limited to 'release/src/router/busybox/coreutils/date.c')
| -rw-r--r-- | release/src/router/busybox/coreutils/date.c | 388 |
1 files changed, 176 insertions, 212 deletions
diff --git a/release/src/router/busybox/coreutils/date.c b/release/src/router/busybox/coreutils/date.c index 7d14ec32..177b7d07 100644 --- a/release/src/router/busybox/coreutils/date.c +++ b/release/src/router/busybox/coreutils/date.c @@ -3,223 +3,181 @@ * Mini date implementation for busybox * * by Matthew Grant <grantma@anathoth.gen.nz> - * - * iso-format handling added by Robert Griebl <griebl@gmx.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * iso-format handling added by Robert Griebl <griebl@gmx.de> + * bugfixes and cleanup by Bernhard Reutner-Fischer * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdlib.h> -#include <errno.h> -#include <sys/time.h> -#include <unistd.h> -#include <time.h> -#include <stdio.h> -#include <string.h> -#include <getopt.h> -#include "busybox.h" - +#include "libbb.h" -/* This 'date' command supports only 2 time setting formats, +/* This 'date' command supports only 2 time setting formats, all the GNU strftime stuff (its in libc, lets use it), - setting time using UTC and displaying int, as well as - an RFC 822 complient date output for shell scripting + setting time using UTC and displaying it, as well as + an RFC 2822 compliant date output for shell scripting mail commands */ /* Input parsing code is always bulky - used heavy duty libc stuff as much as possible, missed out a lot of bounds checking */ -/* Default input handling to save suprising some people */ - -static struct tm *date_conv_time(struct tm *tm_time, const char *t_string) -{ - int nr; - - nr = sscanf(t_string, "%2d%2d%2d%2d%d", &(tm_time->tm_mon), - &(tm_time->tm_mday), &(tm_time->tm_hour), &(tm_time->tm_min), - &(tm_time->tm_year)); - - if (nr < 4 || nr > 5) { - bb_error_msg_and_die(bb_msg_invalid_date, t_string); - } - - /* correct for century - minor Y2K problem here? */ - if (tm_time->tm_year >= 1900) { - tm_time->tm_year -= 1900; - } - /* adjust date */ - tm_time->tm_mon -= 1; - - return (tm_time); - -} +/* Default input handling to save surprising some people */ -/* The new stuff for LRP */ +#define DATE_OPT_RFC2822 0x01 +#define DATE_OPT_SET 0x02 +#define DATE_OPT_UTC 0x04 +#define DATE_OPT_DATE 0x08 +#define DATE_OPT_REFERENCE 0x10 +#define DATE_OPT_TIMESPEC 0x20 +#define DATE_OPT_HINT 0x40 -static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string) +static void maybe_set_utc(int opt) { - struct tm t; - - /* Parse input and assign appropriately to tm_time */ - - if (t = - *tm_time, sscanf(t_string, "%d:%d:%d", &t.tm_hour, &t.tm_min, - &t.tm_sec) == 3) { - /* no adjustments needed */ - } else if (t = - *tm_time, sscanf(t_string, "%d:%d", &t.tm_hour, - &t.tm_min) == 2) { - /* no adjustments needed */ - } else if (t = - *tm_time, sscanf(t_string, "%d.%d-%d:%d:%d", &t.tm_mon, - &t.tm_mday, &t.tm_hour, &t.tm_min, - &t.tm_sec) == 5) { - /* Adjust dates from 1-12 to 0-11 */ - t.tm_mon -= 1; - } else if (t = - *tm_time, sscanf(t_string, "%d.%d-%d:%d", &t.tm_mon, - &t.tm_mday, &t.tm_hour, &t.tm_min) == 4) { - /* Adjust dates from 1-12 to 0-11 */ - t.tm_mon -= 1; - } else if (t = - *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d:%d", &t.tm_year, - &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, - &t.tm_sec) == 6) { - t.tm_year -= 1900; /* Adjust years */ - t.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - } else if (t = - *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d", &t.tm_year, - &t.tm_mon, &t.tm_mday, &t.tm_hour, - &t.tm_min) == 5) { - t.tm_year -= 1900; /* Adjust years */ - t.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - } else { - bb_error_msg_and_die(bb_msg_invalid_date, t_string); - } - *tm_time = t; - return (tm_time); + if (opt & DATE_OPT_UTC) + putenv((char*)"TZ=UTC0"); } - -int date_main(int argc, char **argv) +int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int date_main(int argc UNUSED_PARAM, char **argv) { - char *date_str = NULL; - char *date_fmt = NULL; - char *t_buff; - int set_time; - int rfc822; - int utc; - int use_arg = 0; - time_t tm; - unsigned long opt; struct tm tm_time; - -#ifdef CONFIG_FEATURE_DATE_ISOFMT - int ifmt = 0; - char *isofmt_arg; - -# define GETOPT_ISOFMT "I::" -#else -# define GETOPT_ISOFMT -#endif - bb_opt_complementaly = "d~ds:s~ds"; - opt = bb_getopt_ulflags(argc, argv, "Rs:ud:" GETOPT_ISOFMT, - &date_str, &date_str -#ifdef CONFIG_FEATURE_DATE_ISOFMT - , &isofmt_arg -#endif - ); - rfc822 = opt & 1; - set_time = opt & 2; - utc = opt & 4; - if(utc) { - if (putenv("TZ=UTC0") != 0) - bb_error_msg_and_die(bb_msg_memory_exhausted); - } - use_arg = opt & 8; - if(opt & 0x80000000UL) + time_t tm; + unsigned opt; + int ifmt = -1; + char *date_str; + char *fmt_dt2str; + char *fmt_str2dt; + char *filename; + char *isofmt_arg = NULL; + + opt_complementary = "d--s:s--d" + USE_FEATURE_DATE_ISOFMT(":R--I:I--R"); + opt = getopt32(argv, "Rs:ud:r:" + USE_FEATURE_DATE_ISOFMT("I::D:"), + &date_str, &date_str, &filename + USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt)); + argv += optind; + maybe_set_utc(opt); + + if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) { + ifmt = 0; /* default is date */ + if (isofmt_arg) { + static const char isoformats[] ALIGN1 = + "date\0""hours\0""minutes\0""seconds\0"; + ifmt = index_in_strings(isoformats, isofmt_arg); + if (ifmt < 0) bb_show_usage(); -#ifdef CONFIG_FEATURE_DATE_ISOFMT - if(opt & 16) { - if (!isofmt_arg) - ifmt = 1; - else { - int ifmt_len = bb_strlen(isofmt_arg); - - if ((ifmt_len <= 4) - && (strncmp(isofmt_arg, "date", ifmt_len) == 0)) { - ifmt = 1; - } else if ((ifmt_len <= 5) - && (strncmp(isofmt_arg, "hours", ifmt_len) == 0)) { - ifmt = 2; - } else if ((ifmt_len <= 7) - && (strncmp(isofmt_arg, "minutes", ifmt_len) == 0)) { - ifmt = 3; - } else if ((ifmt_len <= 7) - && (strncmp(isofmt_arg, "seconds", ifmt_len) == 0)) { - ifmt = 4; - } - } - if (!ifmt) { - bb_show_usage(); } } -#endif - if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+')) { - date_fmt = &argv[optind][1]; /* Skip over the '+' */ - } else if (date_str == NULL) { - set_time = 1; - date_str = argv[optind]; + fmt_dt2str = NULL; + if (argv[0] && argv[0][0] == '+') { + fmt_dt2str = &argv[0][1]; /* Skip over the '+' */ + argv++; + } + if (!(opt & (DATE_OPT_SET | DATE_OPT_DATE))) { + opt |= DATE_OPT_SET; + date_str = argv[0]; /* can be NULL */ + if (date_str) + argv++; } + if (*argv) + bb_show_usage(); /* Now we have parsed all the information except the date format which depends on whether the clock is being set or read */ - time(&tm); + if (opt & DATE_OPT_REFERENCE) { + struct stat statbuf; + xstat(filename, &statbuf); + tm = statbuf.st_mtime; + } else + time(&tm); memcpy(&tm_time, localtime(&tm), sizeof(tm_time)); - /* Zero out fields - take her back to midnight! */ + + /* If date string is given, update tm_time, and maybe set date */ if (date_str != NULL) { + /* Zero out fields - take her back to midnight! */ tm_time.tm_sec = 0; tm_time.tm_min = 0; tm_time.tm_hour = 0; - } - - /* Process any date input to UNIX time since 1 Jan 1970 */ - if (date_str != NULL) { - if (strchr(date_str, ':') != NULL) { - date_conv_ftime(&tm_time, date_str); + /* Process any date input to UNIX time since 1 Jan 1970 */ + if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) { + if (strptime(date_str, fmt_str2dt, &tm_time) == NULL) + bb_error_msg_and_die(bb_msg_invalid_date, date_str); } else { - date_conv_time(&tm_time, date_str); + char end = '\0'; + const char *last_colon = strrchr(date_str, ':'); + + if (last_colon != NULL) { + /* Parse input and assign appropriately to tm_time */ + + if (sscanf(date_str, "%u:%u%c", + &tm_time.tm_hour, + &tm_time.tm_min, + &end) >= 2) { + /* no adjustments needed */ + } else if (sscanf(date_str, "%u.%u-%u:%u%c", + &tm_time.tm_mon, &tm_time.tm_mday, + &tm_time.tm_hour, &tm_time.tm_min, + &end) >= 4) { + /* Adjust dates from 1-12 to 0-11 */ + tm_time.tm_mon -= 1; + } else if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &tm_time.tm_year, + &tm_time.tm_mon, &tm_time.tm_mday, + &tm_time.tm_hour, &tm_time.tm_min, + &end) >= 5) { + tm_time.tm_year -= 1900; /* Adjust years */ + tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + } else if (sscanf(date_str, "%u-%u-%u %u:%u%c", &tm_time.tm_year, + &tm_time.tm_mon, &tm_time.tm_mday, + &tm_time.tm_hour, &tm_time.tm_min, + &end) >= 5) { + tm_time.tm_year -= 1900; /* Adjust years */ + tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ +//TODO: coreutils 6.9 also accepts "YYYY-MM-DD HH" (no minutes) + } else { + bb_error_msg_and_die(bb_msg_invalid_date, date_str); + } + if (end == ':') { + if (sscanf(last_colon + 1, "%u%c", &tm_time.tm_sec, &end) == 1) + end = '\0'; + /* else end != NUL and we error out */ + } + } else { + if (sscanf(date_str, "%2u%2u%2u%2u%u%c", &tm_time.tm_mon, + &tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min, + &tm_time.tm_year, &end) < 4) + bb_error_msg_and_die(bb_msg_invalid_date, date_str); + /* correct for century - minor Y2K problem here? */ + if (tm_time.tm_year >= 1900) { + tm_time.tm_year -= 1900; + } + /* adjust date */ + tm_time.tm_mon -= 1; + if (end == '.') { + if (sscanf(strchr(date_str, '.') + 1, "%u%c", + &tm_time.tm_sec, &end) == 1) + end = '\0'; + /* else end != NUL and we error out */ + } + } + if (end != '\0') { + bb_error_msg_and_die(bb_msg_invalid_date, date_str); + } } - /* Correct any day of week and day of year etc. fields */ tm_time.tm_isdst = -1; /* Be sure to recheck dst. */ tm = mktime(&tm_time); if (tm < 0) { bb_error_msg_and_die(bb_msg_invalid_date, date_str); } - if (utc && (putenv("TZ=UTC0") != 0)) { - bb_error_msg_and_die(bb_msg_memory_exhausted); - } + maybe_set_utc(opt); /* if setting time, set it */ - if (set_time && (stime(&tm) < 0)) { + if ((opt & DATE_OPT_SET) && stime(&tm) < 0) { bb_perror_msg("cannot set date"); } } @@ -227,49 +185,55 @@ int date_main(int argc, char **argv) /* Display output */ /* Deal with format string */ - if (date_fmt == NULL) { -#ifdef CONFIG_FEATURE_DATE_ISOFMT - switch (ifmt) { - case 4: - date_fmt = utc ? "%Y-%m-%dT%H:%M:%SZ" : "%Y-%m-%dT%H:%M:%S%z"; - break; - case 3: - date_fmt = utc ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M%z"; - break; - case 2: - date_fmt = utc ? "%Y-%m-%dT%HZ" : "%Y-%m-%dT%H%z"; - break; - case 1: - date_fmt = "%Y-%m-%d"; - break; - case 0: - default: -#endif - date_fmt = - (rfc822 - ? (utc ? "%a, %e %b %Y %H:%M:%S GMT" : - "%a, %e %b %Y %H:%M:%S %z") : "%a %b %e %H:%M:%S %Z %Y"); - -#ifdef CONFIG_FEATURE_DATE_ISOFMT - break; - } -#endif - } else if (*date_fmt == '\0') { - /* Imitate what GNU 'date' does with NO format string! */ - printf("\n"); - return EXIT_SUCCESS; + if (fmt_dt2str == NULL) { + int i; + fmt_dt2str = xzalloc(32); + if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) { + strcpy(fmt_dt2str, "%Y-%m-%d"); + if (ifmt > 0) { + i = 8; + fmt_dt2str[i++] = 'T'; + fmt_dt2str[i++] = '%'; + fmt_dt2str[i++] = 'H'; + if (ifmt > 1) { + fmt_dt2str[i++] = ':'; + fmt_dt2str[i++] = '%'; + fmt_dt2str[i++] = 'M'; + if (ifmt > 2) { + fmt_dt2str[i++] = ':'; + fmt_dt2str[i++] = '%'; + fmt_dt2str[i++] = 'S'; + } + } + format_utc: + fmt_dt2str[i++] = '%'; + fmt_dt2str[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z'; + } + } else if (opt & DATE_OPT_RFC2822) { + /* Undo busybox.c for date -R */ + if (ENABLE_LOCALE_SUPPORT) + setlocale(LC_TIME, "C"); + strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S "); + i = 22; + goto format_utc; + } else /* default case */ + fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y"; } - /* Handle special conversions */ +#define date_buf bb_common_bufsiz1 + if (*fmt_dt2str == '\0') { + /* With no format string, just print a blank line */ + date_buf[0] = '\0'; + } else { + /* Handle special conversions */ + if (strncmp(fmt_dt2str, "%f", 2) == 0) { + fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S"; + } - if (strncmp(date_fmt, "%f", 2) == 0) { - date_fmt = "%Y.%m.%d-%H:%M:%S"; + /* Generate output string */ + strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time); } - - /* Print OUTPUT (after ALL that!) */ - t_buff = xmalloc(201); - strftime(t_buff, 200, date_fmt, &tm_time); - puts(t_buff); + puts(date_buf); return EXIT_SUCCESS; } |