X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=date.c;h=4b2f66add384cfc87b32eaf3d3bbb0922547df26;hb=e5f39576650933770153e82c63a46f27fcd72b0e;hp=b4c3e71535518997677834ec17326b9522c58d29;hpb=e49d5ecbbe51718fa925b6890a735e5937cc2aa2;p=oweals%2Fbusybox.git diff --git a/date.c b/date.c index b4c3e7153..4b2f66add 100644 --- a/date.c +++ b/date.c @@ -20,17 +20,19 @@ * */ -#include "internal.h" -#define BB_DECLARE_EXTERN -#define bb_need_invalid_date -#define bb_need_memory_exhausted -#include "messages.c" #include #include #include #include #include #include +#include +#include +#include "busybox.h" +#define BB_DECLARE_EXTERN +#define bb_need_invalid_date +#define bb_need_memory_exhausted +#include "messages.c" /* This 'date' command supports only 2 time setting formats, @@ -39,21 +41,12 @@ an RFC 822 complient date output for shell scripting mail commands */ -static const char date_usage[] = "date [OPTION]... [+FORMAT]\n" - " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n" - "Display the current time in the given FORMAT, or set the system date.\n" - "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n" - "\t-s\t\tset time described by STRING\n" - - "\t-u\t\tprint or set Coordinated Universal Time\n"; - - /* 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 */ -struct tm *date_conv_time(struct tm *tm_time, const char *t_string) +static struct tm *date_conv_time(struct tm *tm_time, const char *t_string) { int nr; @@ -64,8 +57,7 @@ struct tm *date_conv_time(struct tm *tm_time, const char *t_string) &(tm_time->tm_min), &(tm_time->tm_year)); if (nr < 4 || nr > 5) { - fprintf(stderr, invalid_date, "date", t_string); - exit(FALSE); + error_msg_and_die(invalid_date, t_string); } /* correct for century - minor Y2K problem here? */ @@ -81,78 +73,59 @@ struct tm *date_conv_time(struct tm *tm_time, const char *t_string) /* The new stuff for LRP */ -struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string) +static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string) { - struct tm itm_time, jtm_time, ktm_time, ltm_time, mtm_time, ntm_time; - - itm_time = *tm_time; - jtm_time = *tm_time; - ktm_time = *tm_time; - ltm_time = *tm_time; - mtm_time = *tm_time; - ntm_time = *tm_time; + struct tm t; /* Parse input and assign appropriately to tm_time */ - if (sscanf(t_string, "%d:%d:%d", - &itm_time.tm_hour, &itm_time.tm_min, &itm_time.tm_sec) == 3) { - - *tm_time = itm_time; - return (tm_time); - - } else if (sscanf(t_string, "%d:%d", - &jtm_time.tm_hour, &jtm_time.tm_min) == 2) { - - *tm_time = jtm_time; - return (tm_time); - - } else if (sscanf(t_string, "%d.%d-%d:%d:%d", - &ktm_time.tm_mon, - &ktm_time.tm_mday, - &ktm_time.tm_hour, - &ktm_time.tm_min, &ktm_time.tm_sec) == 5) { - - ktm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ktm_time; - return (tm_time); - - } else if (sscanf(t_string, "%d.%d-%d:%d", - <m_time.tm_mon, - <m_time.tm_mday, - <m_time.tm_hour, <m_time.tm_min) == 4) { - - ltm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ltm_time; - return (tm_time); - - } else if (sscanf(t_string, "%d.%d.%d-%d:%d:%d", - &mtm_time.tm_year, - &mtm_time.tm_mon, - &mtm_time.tm_mday, - &mtm_time.tm_hour, - &mtm_time.tm_min, &mtm_time.tm_sec) == 6) { - - mtm_time.tm_year -= 1900; /* Adjust years */ - mtm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = mtm_time; - return (tm_time); - - } else if (sscanf(t_string, "%d.%d.%d-%d:%d", - &ntm_time.tm_year, - &ntm_time.tm_mon, - &ntm_time.tm_mday, - &ntm_time.tm_hour, &ntm_time.tm_min) == 5) { - ntm_time.tm_year -= 1900; /* Adjust years */ - ntm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ntm_time; - return (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 */ - } - fprintf(stderr, invalid_date, "date", t_string); + } 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) { - exit(FALSE); + t.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + } 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) { + + 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:%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 { + error_msg_and_die(invalid_date, t_string); + } + *tm_time = t; + return (tm_time); } @@ -161,7 +134,7 @@ int date_main(int argc, char **argv) char *date_str = NULL; char *date_fmt = NULL; char *t_buff; - int i; + int c; int set_time = 0; int rfc822 = 0; int utc = 0; @@ -170,51 +143,44 @@ int date_main(int argc, char **argv) struct tm tm_time; /* Interpret command line args */ - i = --argc; - argv++; - while (i > 0 && **argv) { - if (**argv == '-') { - while (i > 0 && *++(*argv)) - switch (**argv) { - case 'R': - rfc822 = 1; - break; - case 's': - set_time = 1; - if (date_str != NULL) - usage(date_usage); - date_str = optarg; - break; - case 'u': - utc = 1; - if (putenv("TZ=UTC0") != 0) { - fprintf(stderr, memory_exhausted, "date"); - exit(FALSE); - } - /* Look ma, no break. Don't fix it either. */ - case 'd': - use_arg = 1; - if (date_str != NULL) - usage(date_usage); - date_str = optarg; - break; - case '-': - usage(date_usage); - } - } else { - if ((date_fmt == NULL) && (strcmp(*argv, "+") == 0)) - date_fmt = *argv; - else if (date_str == NULL) { + while ((c = getopt(argc, argv, "Rs:ud:")) != EOF) { + switch (c) { + case 'R': + rfc822 = 1; + break; + case 's': set_time = 1; - date_str = *argv; - } else { - usage(date_usage); - } + if ((date_str != NULL) || ((date_str = optarg) == NULL)) { + show_usage(); + } + break; + case 'u': + utc = 1; + if (putenv("TZ=UTC0") != 0) + error_msg_and_die(memory_exhausted); + break; + case 'd': + use_arg = 1; + if ((date_str != NULL) || ((date_str = optarg) == NULL)) + show_usage(); + break; + default: + show_usage(); } - i--; - argv++; } + 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]; + } +#if 0 + else { + error_msg("date_str='%s' date_fmt='%s'\n", date_str, date_fmt); + show_usage(); + } +#endif /* Now we have parsed all the information except the date format which depends on whether the clock is being set or read */ @@ -239,16 +205,17 @@ int date_main(int argc, char **argv) /* Correct any day of week and day of year etc fields */ tm = mktime(&tm_time); - if (tm < 0) { - fprintf(stderr, invalid_date, "date", date_str); - exit(FALSE); + if (tm < 0) + error_msg_and_die(invalid_date, date_str); + if ( utc ) { + if (putenv("TZ=UTC0") != 0) + error_msg_and_die(memory_exhausted); } /* if setting time, set it */ if (set_time) { if (stime(&tm) < 0) { - fprintf(stderr, "date: can't set date.\n"); - exit(FALSE); + perror_msg("cannot set date"); } } } @@ -266,7 +233,7 @@ int date_main(int argc, char **argv) } else if (*date_fmt == '\0') { /* Imitate what GNU 'date' does with NO format string! */ printf("\n"); - exit(TRUE); + return EXIT_SUCCESS; } /* Handle special conversions */ @@ -276,10 +243,9 @@ int date_main(int argc, char **argv) } /* Print OUTPUT (after ALL that!) */ - t_buff = malloc(201); + t_buff = xmalloc(201); strftime(t_buff, 200, date_fmt, &tm_time); printf("%s\n", t_buff); - exit(TRUE); - + return EXIT_SUCCESS; }