Merge branch 'busybox' into merge

Disable FEATURE_TIMEZONE for now.

2 files changed, 76 insertions, 13 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index f97de8ef7..58c5fad50 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -395,3 +395,14 @@ config FEATURE_HWIB
         default y
         help
         Support for printing infiniband addresses in network applets.
+
+config FEATURE_TIMEZONE
+        bool "Allow timezone in dates"
+        default y
+        depends on DESKTOP
+        help
+        Permit the use of timezones when parsing user-provided data
+        strings, e.g. '1996-04-09 12:45:00 -0500'.
+
+        This requires support for the '%z' extension to strptime() which
+        may not be available in all implementations.
diff --git a/libbb/time.c b/libbb/time.c
index cf5f2e5c8..41a69c754 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -8,16 +8,74 @@
  */
 #include "libbb.h"
 
-void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
+/* Returns 0 if the time structure contains an absolute UTC time which
+ * should not be subject to DST adjustment by the caller. */
+int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
 {
         char end = '\0';
+#if ENABLE_DESKTOP
+/*
+ * strptime is BIG: ~1k in uclibc, ~10k in glibc
+ * We need it for 'month_name d HH:MM:SS YYYY', supported by GNU date,
+ * but if we've linked it we might as well use it for everything.
+ */
+        static const char fmt_str[] ALIGN1 =
+                "%R" "\0"               /* HH:MM */
+                "%T" "\0"               /* HH:MM:SS */
+                "%m.%d-%R" "\0"         /* mm.dd-HH:MM */
+                "%m.%d-%T" "\0"         /* mm.dd-HH:MM:SS */
+                "%Y.%m.%d-%R" "\0"      /* yyyy.mm.dd-HH:MM */
+                "%Y.%m.%d-%T" "\0"      /* yyyy.mm.dd-HH:MM:SS */
+                "%b %d %T %Y" "\0"      /* month_name d HH:MM:SS YYYY */
+                "%Y-%m-%d %R" "\0"      /* yyyy-mm-dd HH:MM */
+                "%Y-%m-%d %T" "\0"      /* yyyy-mm-dd HH:MM:SS */
+#if ENABLE_FEATURE_TIMEZONE
+                "%Y-%m-%d %R %z" "\0"   /* yyyy-mm-dd HH:MM TZ */
+                "%Y-%m-%d %T %z" "\0"   /* yyyy-mm-dd HH:MM:SS TZ */
+#endif
+                "%Y-%m-%d %H" "\0"      /* yyyy-mm-dd HH */
+                "%Y-%m-%d" "\0"         /* yyyy-mm-dd */
+                /* extra NUL */;
+        struct tm save;
+        const char *fmt;
+        char *endp;
+
+        save = *ptm;
+        fmt = fmt_str;
+        while (*fmt) {
+                endp = strptime(date_str, fmt, ptm);
+                if (endp && *endp == '\0') {
+#if ENABLE_FEATURE_TIMEZONE
+                        if (strchr(fmt, 'z')) {
+                                time_t t;
+                                struct tm *utm;
+
+                                /* we have timezone offset: obtain Unix time_t */
+                                ptm->tm_sec -= ptm->tm_gmtoff;
+                                ptm->tm_isdst = 0;
+                                t = timegm(ptm);
+                                if (t == (time_t)-1)
+                                        break;
+                                /* convert Unix time_t to struct tm in user's locale */
+                                utm = localtime(&t);
+                                if (!utm)
+                                        break;
+                                *ptm = *utm;
+                                return 0;
+                        }
+#endif
+                        return 1;
+                }
+                *ptm = save;
+                while (*++fmt)
+                        continue;
+                ++fmt;
+        }
+#else
         const char *last_colon = strrchr(date_str, ':');
 
         if (last_colon != NULL) {
                 /* Parse input and assign appropriately to ptm */
-#if ENABLE_DESKTOP
-                const char *endp;
-#endif
 
                 /* HH:MM */
                 if (sscanf(date_str, "%u:%u%c",
@@ -50,14 +108,6 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                         ptm->tm_year -= 1900; /* Adjust years */
                         ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
                 } else
-#if ENABLE_DESKTOP  /* strptime is BIG: ~1k in uclibc, ~10k in glibc */
-                /* month_name d HH:MM:SS YYYY. Supported by GNU date */
-                if ((endp = strptime(date_str, "%b %d %T %Y", ptm)) != NULL
-                 && *endp == '\0'
-                ) {
-                        return; /* don't fall through to end == ":" check */
-                } else
-#endif
                 {
                         bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                 }
@@ -89,6 +139,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 ptm->tm_year -= 1900; /* Adjust years */
                 ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
         } else
+#endif /* ENABLE_DESKTOP */
         if (date_str[0] == '@') {
                 time_t t;
                 if (sizeof(t) <= sizeof(long))
@@ -99,7 +150,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                         struct tm *lt = localtime(&t);
                         if (lt) {
                                 *ptm = *lt;
-                                return;
+                                return 0;
                         }
                 }
                 end = '1';
@@ -216,6 +267,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
         if (end != '\0') {
                 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
         }
+        return 1;
 }
 
 time_t FAST_FUNC validate_tm_time(const char *date_str, struct tm *ptm)