Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/time.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/time.c (modified) (2 diffs)

branches/3.2/mindi-busybox/libbb/time.c

@@ -92 +92 @@
          * 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;
 
@@ -134 +141 @@
             /* 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] */