diff options
Diffstat (limited to 'toys')
| -rw-r--r-- | toys/posix/date.c | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/toys/posix/date.c b/toys/posix/date.c index 9f244ca0..40c1fed2 100644 --- a/toys/posix/date.c +++ b/toys/posix/date.c @@ -17,15 +17,18 @@ config DATE Set/get the current date/time. With no SET shows the current date. - Default SET format is "MMDDhhmm[[CC]YY][.ss]", that's (2 digits each) - month, day, hour (0-23), and minute. Optionally century, year, and second. - Also accepts "@UNIXTIME[.FRACTION]" as seconds since midnight Jan 1 1970. - -d Show DATE instead of current time (convert date format) -D +FORMAT for SET or -d (instead of MMDDhhmm[[CC]YY][.ss]) -r Use modification time of FILE instead of current date -u Use UTC instead of current timezone + Supported input formats: + + MMDDhhmm[[CC]YY][.ss] POSIX + @UNIXTIME[.FRACTION] seconds since midnight 1970-01-01 + YYYY-MM-DD [hh:mm[:ss]] ISO 8601 + hh:mm[:ss] 24-hour time today + +FORMAT specifies display format string using strftime(3) syntax: %% literal % %n newline %t tab @@ -53,11 +56,17 @@ GLOBALS( unsigned nano; ) +static const char *formats[] = { + // Formats with years must come first. + "%Y-%m-%d %H:%M:%S", "%Y-%m-%d %H:%M", "%Y-%m-%d", + "%H:%M:%S", "%H:%M", 0 +}; + // Handle default posix date format (mmddhhmm[[cc]yy]) or @UNIX[.FRAC] // returns 0 success, nonzero for error static int parse_default(char *str, struct tm *tm) { - int len = 0; + int len = 0, i; // Parse @UNIXTIME[.FRACTION] if (*str == '@') { @@ -83,7 +92,20 @@ static int parse_default(char *str, struct tm *tm) return 0; } - // Posix format + // Is it one of the fancy formats? + for (i = 0; formats[i]; ++i) { + time_t now = time(NULL); + char *p; + + if (!strchr(formats[i], 'Y')) { + localtime_r(&now, tm); + tm->tm_hour = tm->tm_min = tm->tm_sec = 0; + } + if ((p = strptime(str, formats[i], tm)) && !*p) return 0; + } + memset(tm, 0, sizeof(struct tm)); + + // Posix format? sscanf(str, "%2u%2u%2u%2u%n", &tm->tm_mon, &tm->tm_mday, &tm->tm_hour, &tm->tm_min, &len); if (len != 8) return 1; |