--- trunk/mkinitrd-magellan/busybox/coreutils/date.c 2007/09/01 22:45:15 532 +++ trunk/mkinitrd-magellan/busybox/coreutils/date.c 2009/04/24 18:33:46 816 @@ -5,12 +5,12 @@ * by Matthew Grant * * iso-format handling added by Robert Griebl - * bugfixes and cleanup by Bernhard Fischer + * bugfixes and cleanup by Bernhard Reutner-Fischer * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include "busybox.h" +#include "libbb.h" /* This 'date' command supports only 2 time setting formats, all the GNU strftime stuff (its in libc, lets use it), @@ -32,142 +32,142 @@ #define DATE_OPT_TIMESPEC 0x20 #define DATE_OPT_HINT 0x40 -static void xputenv(char *s) -{ - if (putenv(s) != 0) - bb_error_msg_and_die(bb_msg_memory_exhausted); -} - static void maybe_set_utc(int opt) { if (opt & DATE_OPT_UTC) - xputenv("TZ=UTC0"); + 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) { - time_t tm; struct tm tm_time; + time_t tm; unsigned opt; int ifmt = -1; - char *date_str = NULL; - char *date_fmt = NULL; - char *filename = NULL; - char *isofmt_arg; - char *hintfmt_arg; + char *date_str; + char *fmt_dt2str; + char *fmt_str2dt; + char *filename; + char *isofmt_arg = NULL; - opt_complementary = "?:d--s:s--d" + opt_complementary = "d--s:s--d" USE_FEATURE_DATE_ISOFMT(":R--I:I--R"); - opt = getopt32(argc, argv, "Rs:ud:r:" + opt = getopt32(argv, "Rs:ud:r:" USE_FEATURE_DATE_ISOFMT("I::D:"), &date_str, &date_str, &filename - USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg)); + USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt)); + argv += optind; maybe_set_utc(opt); if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) { - if (!isofmt_arg) { - ifmt = 0; /* default is date */ - } else { - const char * const isoformats[] = - {"date", "hours", "minutes", "seconds"}; - - for (ifmt = 0; ifmt < 4; ifmt++) - if (!strcmp(isofmt_arg, isoformats[ifmt])) { - break; - } - if (ifmt == 4) /* parse error */ + 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(); } } - /* XXX, date_fmt == NULL from this always */ - if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+')) { - date_fmt = &argv[optind][1]; /* Skip over the '+' */ - } else if (date_str == NULL) { + 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[optind]; + 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 */ - if (filename) { + 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 (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) { - strptime(date_str, hintfmt_arg, &tm_time); - } else if (strchr(date_str, ':') != NULL) { - /* Parse input and assign appropriately to tm_time */ - - if (sscanf(date_str, "%d:%d:%d", &tm_time.tm_hour, &tm_time.tm_min, - &tm_time.tm_sec) == 3) { - /* no adjustments needed */ - } else if (sscanf(date_str, "%d:%d", &tm_time.tm_hour, - &tm_time.tm_min) == 2) { - /* no adjustments needed */ - } else if (sscanf(date_str, "%d.%d-%d:%d:%d", &tm_time.tm_mon, - &tm_time.tm_mday, &tm_time.tm_hour, - &tm_time.tm_min, &tm_time.tm_sec) == 5) { - /* Adjust dates from 1-12 to 0-11 */ - tm_time.tm_mon -= 1; - } else if (sscanf(date_str, "%d.%d-%d:%d", &tm_time.tm_mon, - &tm_time.tm_mday, - &tm_time.tm_hour, &tm_time.tm_min) == 4) { - /* Adjust dates from 1-12 to 0-11 */ - tm_time.tm_mon -= 1; - } else if (sscanf(date_str, "%d.%d.%d-%d:%d:%d", &tm_time.tm_year, - &tm_time.tm_mon, &tm_time.tm_mday, - &tm_time.tm_hour, &tm_time.tm_min, - &tm_time.tm_sec) == 6) { - 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, "%d.%d.%d-%d:%d", &tm_time.tm_year, - &tm_time.tm_mon, &tm_time.tm_mday, - &tm_time.tm_hour, &tm_time.tm_min) == 5) { - tm_time.tm_year -= 1900; /* Adjust years */ - tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - } else { + if (strptime(date_str, fmt_str2dt, &tm_time) == NULL) bb_error_msg_and_die(bb_msg_invalid_date, date_str); - } } else { - int nr; - char *cp; + char end = '\0'; + const char *last_colon = strrchr(date_str, ':'); - nr = sscanf(date_str, "%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, date_str); - } + if (last_colon != NULL) { + /* Parse input and assign appropriately to tm_time */ - cp = strchr(date_str, '.'); - if (cp) { - nr = sscanf(cp + 1, "%2d", &tm_time.tm_sec); - if (nr != 1) { + 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 */ + } } - - /* correct for century - minor Y2K problem here? */ - if (tm_time.tm_year >= 1900) { - tm_time.tm_year -= 1900; + if (end != '\0') { + bb_error_msg_and_die(bb_msg_invalid_date, date_str); } - /* adjust date */ - tm_time.tm_mon -= 1; } - /* 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); @@ -185,56 +185,55 @@ /* Display output */ /* Deal with format string */ - - if (date_fmt == NULL) { + if (fmt_dt2str == NULL) { int i; - date_fmt = xzalloc(32); + fmt_dt2str = xzalloc(32); if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) { - strcpy(date_fmt, "%Y-%m-%d"); + strcpy(fmt_dt2str, "%Y-%m-%d"); if (ifmt > 0) { i = 8; - date_fmt[i++] = 'T'; - date_fmt[i++] = '%'; - date_fmt[i++] = 'H'; + fmt_dt2str[i++] = 'T'; + fmt_dt2str[i++] = '%'; + fmt_dt2str[i++] = 'H'; if (ifmt > 1) { - date_fmt[i++] = ':'; - date_fmt[i++] = '%'; - date_fmt[i++] = 'M'; + fmt_dt2str[i++] = ':'; + fmt_dt2str[i++] = '%'; + fmt_dt2str[i++] = 'M'; + if (ifmt > 2) { + fmt_dt2str[i++] = ':'; + fmt_dt2str[i++] = '%'; + fmt_dt2str[i++] = 'S'; + } } - if (ifmt > 2) { - date_fmt[i++] = ':'; - date_fmt[i++] = '%'; - date_fmt[i++] = 'S'; - } -format_utc: - date_fmt[i++] = '%'; - date_fmt[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z'; + 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(date_fmt, "%a, %d %b %Y %H:%M:%S "); + strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S "); i = 22; goto format_utc; } else /* default case */ - date_fmt = "%a %b %e %H:%M:%S %Z %Y"; + fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y"; } - if (*date_fmt == '\0') { +#define date_buf bb_common_bufsiz1 + if (*fmt_dt2str == '\0') { /* With no format string, just print a blank line */ - *bb_common_bufsiz1 = 0; + date_buf[0] = '\0'; } else { /* Handle special conversions */ - - if (strncmp(date_fmt, "%f", 2) == 0) { - date_fmt = "%Y.%m.%d-%H:%M:%S"; + if (strncmp(fmt_dt2str, "%f", 2) == 0) { + fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S"; } /* Generate output string */ - strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time); + strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time); } - puts(bb_common_bufsiz1); + puts(date_buf); return EXIT_SUCCESS; }