date: emulate %e format

2 files changed, 31 insertions, 8 deletions

diff --git a/coreutils/date.c b/coreutils/date.c
index 62cceff9c..4860aa308 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -328,11 +328,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                         i = sizeof("%a, %d %b %Y %H:%M:%S ")-1;
                         goto format_utc;
                 } else { /* default case */
-#if ENABLE_PLATFORM_MINGW32
-                        fmt_dt2str = (char*)"%a %b %d %H:%M:%S %Z %Y";
-#else
                         fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
-#endif
                 }
         }
 #if ENABLE_FEATURE_DATE_NANO
@@ -385,10 +381,6 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 if (strncmp(fmt_dt2str, "%f", 2) == 0) {
                         fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
                 }
-#if ENABLE_PLATFORM_MINGW32
-                if (strstr(fmt_dt2str, "%e"))
-                        bb_error_msg_and_die("%%e is not supported by Windows strftime");
-#endif
                 /* Generate output string */
                 strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
         }
diff --git a/win32/mingw.c b/win32/mingw.c
index 70a8cb611..bbeb3b8d8 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -804,6 +804,37 @@ char *strptime(const char *s UNUSED_PARAM, const char *format UNUSED_PARAM, stru
         return NULL;
 }
 
+#undef strftime
+size_t mingw_strftime(const char *buf, size_t max, const char *format, const struct tm *tm)
+{
+        size_t ret;
+        const char *s;
+        char *t;
+        char *fmt = NULL;
+
+        /*
+         * Provide a simple-minded emulation of the '%e' format that Windows'
+         * strftime lacks.  It won't work properly if there's more than one
+         * '%e' or if the user is playing games with '%'s.
+         */
+        if ( (s=strstr(format, "%e")) != NULL ) {
+                fmt = xmalloc(strlen(format)+5);
+                strcpy(fmt, format);
+                t = strstr(fmt, "%e");
+                if ( tm->tm_mday < 10 ) {
+                        strcat(strcpy(t, " %#d"), s+2);
+                }
+                else {
+                        t[1] = 'd';
+                }
+        }
+
+        ret = strftime(buf, max, fmt ? fmt : format, tm);
+        free(fmt);
+
+        return ret;
+}
+
 #undef access
 int mingw_access(const char *name, int mode)
 {