* 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
*
*/
-#include "internal.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_invalid_date
-#define bb_need_memory_exhausted
-#include "messages.c"
#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"
/* This 'date' command supports only 2 time setting formats,
/* 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;
- 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));
+ 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) {
- fatalError(invalid_date, t_string);
+ error_msg_and_die(invalid_date, t_string);
}
/* correct for century - minor Y2K problem here? */
- if (tm_time->tm_year >= 1900)
+ if (tm_time->tm_year >= 1900) {
tm_time->tm_year -= 1900;
+ }
/* adjust date */
tm_time->tm_mon -= 1;
/* 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 */
+ } 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 {
+ error_msg_and_die(invalid_date, t_string);
}
-
- fatalError(invalid_date, t_string);
+ *tm_time = t;
+ return (tm_time);
}
time_t tm;
struct tm tm_time;
+#ifdef CONFIG_FEATURE_DATE_ISOFMT
+ int ifmt = 0;
+
+# define GETOPT_ISOFMT "I::"
+#else
+# define GETOPT_ISOFMT
+#endif
+
/* Interpret command line args */
- while ((c = getopt(argc, argv, "Rs:ud:")) != EOF) {
+ while ((c = getopt(argc, argv, "Rs:ud:" GETOPT_ISOFMT)) != EOF) {
switch (c) {
case 'R':
rfc822 = 1;
break;
case 's':
set_time = 1;
- if ((date_str != NULL) || ((date_str = optarg) == NULL))
- usage(date_usage);
+ if ((date_str != NULL) || ((date_str = optarg) == NULL)) {
+ show_usage();
+ }
break;
case 'u':
utc = 1;
- if (putenv("TZ=UTC0") != 0)
- fatalError(memory_exhausted);
+ 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))
- usage(date_usage);
+ show_usage();
break;
+#ifdef CONFIG_FEATURE_DATE_ISOFMT
+ case 'I':
+ if (!optarg)
+ ifmt = 1;
+ else {
+ int ifmt_len = xstrlen(optarg);
+
+ if ((ifmt_len <= 4)
+ && (strncmp(optarg, "date", ifmt_len) == 0)) {
+ ifmt = 1;
+ } else if ((ifmt_len <= 5)
+ && (strncmp(optarg, "hours", ifmt_len) == 0)) {
+ ifmt = 2;
+ } else if ((ifmt_len <= 7)
+ && (strncmp(optarg, "minutes", ifmt_len) == 0)) {
+ ifmt = 3;
+ } else if ((ifmt_len <= 7)
+ && (strncmp(optarg, "seconds", ifmt_len) == 0)) {
+ ifmt = 4;
+ }
+ }
+ if (ifmt) {
+ break; /* else show_usage(); */
+ }
+#endif
default:
- usage(date_usage);
+ show_usage();
}
}
- if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+'))
- date_fmt = &argv[optind][1]; /* Skip over the '+' */
- else if (date_str == NULL) {
+
+ 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];
- } else {
- usage(date_usage);
}
/* Now we have parsed all the information except the date format
date_conv_time(&tm_time, date_str);
}
- /* Correct any day of week and day of year etc fields */
+ /* Correct any day of week and day of year etc. fields */
tm = mktime(&tm_time);
- if (tm < 0)
- fatalError(invalid_date, date_str);
+ if (tm < 0) {
+ error_msg_and_die(invalid_date, date_str);
+ }
+ if (utc && (putenv("TZ=UTC0") != 0)) {
+ error_msg_and_die(memory_exhausted);
+ }
/* if setting time, set it */
- if (set_time) {
- if (stime(&tm) < 0) {
- fatalError("can't set date.\n");
- }
+ if (set_time && (stime(&tm) < 0)) {
+ perror_msg("cannot set date");
}
}
/* Deal with format string */
if (date_fmt == NULL) {
- date_fmt = (rfc822
- ? (utc
- ? "%a, %_d %b %Y %H:%M:%S GMT"
- : "%a, %_d %b %Y %H:%M:%S %z")
- : "%a %b %e %H:%M:%S %Z %Y");
+#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");
- exit(TRUE);
+ return EXIT_SUCCESS;
}
/* Handle special conversions */
/* Print OUTPUT (after ALL that!) */
t_buff = xmalloc(201);
strftime(t_buff, 200, date_fmt, &tm_time);
- printf("%s\n", t_buff);
+ puts(t_buff);
- return(TRUE);
+ return EXIT_SUCCESS;
}
projects / oweals / busybox.git / blobdiff