httpd: fix handling of range requests

[oweals/busybox.git] / libbb / time.c

diff --git a/libbb/time.c b/libbb/time.c
index 2a74d34c2c435299f59f845e72ca29f098c125d8..82e6cb172db04efe81a48ba2f840308ab0da8ed9 100644 (file)
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -23,14 +23,16 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                if (sscanf(date_str, "%u:%u%c",
                                        &ptm->tm_hour,
                                        &ptm->tm_min,
-                                       &end) >= 2) {
+                                       &end) >= 2
+               ) {
                        /* no adjustments needed */
                } else
                /* mm.dd-HH:MM */
                if (sscanf(date_str, "%u.%u-%u:%u%c",
                                        &ptm->tm_mon, &ptm->tm_mday,
                                        &ptm->tm_hour, &ptm->tm_min,
-                                       &end) >= 4) {
+                                       &end) >= 4
+               ) {
                        /* Adjust month from 1-12 to 0-11 */
                        ptm->tm_mon -= 1;
                } else
@@ -38,15 +40,13 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &ptm->tm_year,
                                        &ptm->tm_mon, &ptm->tm_mday,
                                        &ptm->tm_hour, &ptm->tm_min,
-                                       &end) >= 5) {
-                       ptm->tm_year -= 1900; /* Adjust years */
-                       ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
-               } else
+                                       &end) >= 5
                /* yyyy-mm-dd HH:MM */
-               if (sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year,
+                || sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year,
                                        &ptm->tm_mon, &ptm->tm_mday,
                                        &ptm->tm_hour, &ptm->tm_min,
-                                       &end) >= 5) {
+                                       &end) >= 5
+               ) {
                        ptm->tm_year -= 1900; /* Adjust years */
                        ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
                } else
@@ -58,7 +58,6 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                        return; /* don't fall through to end == ":" check */
                } else
 #endif
-//TODO: coreutils 6.9 also accepts "yyyy-mm-dd HH" (no minutes)
                {
                        bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                }
@@ -68,7 +67,29 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                end = '\0';
                        /* else end != NUL and we error out */
                }
-       } else if (date_str[0] == '@') {
+       } else
+       if (strchr(date_str, '-')
+           /* Why strchr('-') check?
+            * sscanf below will trash ptm->tm_year, this breaks
+            * if parse_str is "10101010" (iow, "MMddhhmm" form)
+            * because we destroy year. Do these sscanf
+            * only if we saw a dash in parse_str.
+            */
+               /* yyyy-mm-dd HH */
+        && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
+                               &ptm->tm_mon, &ptm->tm_mday,
+                               &ptm->tm_hour,
+                               &end) >= 4
+               /* yyyy-mm-dd */
+            || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
+                               &ptm->tm_mon, &ptm->tm_mday,
+                               &end) >= 3
+           )
+       ) {
+               ptm->tm_year -= 1900; /* Adjust years */
+               ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
+       } else
+       if (date_str[0] == '@') {
                time_t t = bb_strtol(date_str + 1, NULL, 10);
                if (!errno) {
                        struct tm *lt = localtime(&t);
@@ -91,8 +112,15 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 * .SS  Seconds, a number from 0 to 61 (with leap seconds)
                 * Everything but the minutes is optional
                 *
-                * This coincides with the format of "touch -t TIME"
+                * "touch -t DATETIME" format: [[[[[YY]YY]MM]DD]hh]mm[.ss]
+                * Some, but not all, Unix "date DATETIME" commands
+                * move [[YY]YY] past minutes mm field (!).
+                * Coreutils date does it, and SUS mandates it.
+                * (date -s DATETIME does not support this format. lovely!)
+                * In bbox, this format is special-cased in date applet
+                * (IOW: this function assumes "touch -t" format).
                 */
+               unsigned cur_year = ptm->tm_year;
                int len = strchrnul(date_str, '.') - date_str;
 
                /* MM[.SS] */
@@ -133,6 +161,17 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                        &end) >= 5) {
                        /* Adjust month from 1-12 to 0-11 */
                        ptm->tm_mon -= 1;
+                       if ((int)cur_year >= 50) { /* >= 1950 */
+                               /* Adjust year: */
+                               /* 1. Put it in the current century */
+                               ptm->tm_year += (cur_year / 100) * 100;
+                               /* 2. If too far in the past, +100 years */
+                               if (ptm->tm_year < cur_year - 50)
+                                       ptm->tm_year += 100;
+                               /* 3. If too far in the future, -100 years */
+                               if (ptm->tm_year > cur_year + 50)
+                                       ptm->tm_year -= 100;
+                       }
                } else
                /* ccyymmddHHMM[.SS] */
                if (len == 12 && sscanf(date_str, "%4u%2u%2u%2u%2u%c",
@@ -147,6 +186,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                } else {
                        bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                }
+               ptm->tm_sec = 0; /* assume zero if [.SS] is not given */
                if (end == '.') {
                        /* xxx.SS */
                        if (sscanf(strchr(date_str, '.') + 1, "%u%c",
@@ -169,6 +209,27 @@ time_t FAST_FUNC validate_tm_time(const char *date_str, struct tm *ptm)
        return t;
 }
 
+static char* strftime_fmt(char *buf, unsigned len, time_t *tp, const char *fmt)
+{
+       time_t t;
+       if (!tp) {
+               tp = &t;
+               time(tp);
+       }
+       /* Returns pointer to NUL */
+       return buf + strftime(buf, len, fmt, localtime(tp));
+}
+
+char* FAST_FUNC strftime_HHMMSS(char *buf, unsigned len, time_t *tp)
+{
+       return strftime_fmt(buf, len, tp, "%H:%M:%S");
+}
+
+char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
+{
+       return strftime_fmt(buf, len, tp, "%Y-%m-%d %H:%M:%S");
+}
+
 #if ENABLE_MONOTONIC_SYSCALL
 
 #include <sys/syscall.h>