Merge branch 'js/ming-strftime' into next

* js/ming-strftime:
mingw: abort on invalid strftime formats

diff --git a/compat/mingw.c b/compat/mingw.c
index 2d44d21aca8d31f67b16cb9a90245b4db526ff76..a67872babf332b7d8177e8477c2ee595d8cbbd3f 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -761,6 +761,17 @@ int mingw_utime (const char *file_name, const struct utimbuf *times)
        return rc;
 }
 
+#undef strftime
+size_t mingw_strftime(char *s, size_t max,
+                     const char *format, const struct tm *tm)
+{
+       size_t ret = strftime(s, max, format, tm);
+
+       if (!ret && errno == EINVAL)
+               die("invalid strftime format: '%s'", format);
+       return ret;
+}
+
 unsigned int sleep (unsigned int seconds)
 {
        Sleep(seconds*1000);

diff --git a/compat/mingw.h b/compat/mingw.h
index e03aecfe2e6556e1ef513922104557373eaa9260..571019d0bddceaf3245e15dbcc4ebfb70a501d17 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -361,6 +361,9 @@ int mingw_fstat(int fd, struct stat *buf);
 
 int mingw_utime(const char *file_name, const struct utimbuf *times);
 #define utime mingw_utime
+size_t mingw_strftime(char *s, size_t max,
+                  const char *format, const struct tm *tm);
+#define strftime mingw_strftime
 
 pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
                     const char *dir,