3 files changed, 16 insertions, 4 deletions
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index 7f60ca234..983d7a246 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -94,11 +94,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
        if (opts & OPT_u) {
                chp = mktemp(chp);
-#if !ENABLE_PLATFORM_MINGW32
                if (chp[0] == '\0')
-#else
-                if (chp == NULL || chp[0] == '\0')
-#endif
                        goto error;
        } else if (opts & OPT_d) {
                if (mkdtemp(chp) == NULL)
diff --git a/include/mingw.h b/include/mingw.h
index b3fc603c0..d6eb5d22c 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -164,12 +164,14 @@ int mingw_system(const char *cmd);
 int clearenv(void);
 char *mingw_getenv(const char *name);
+char *mingw_mktemp(char *template);
 int mkstemp(char *template);
 char *realpath(const char *path, char *resolved_path);
 int setenv(const char *name, const char *value, int replace);
 void unsetenv(const char *env);
 #define getenv mingw_getenv
+#define mktemp mingw_mktemp
 /*
 * sys/ioctl.h
diff --git a/win32/mingw.c b/win32/mingw.c
index b9f720e1a..70a8cb611 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -435,6 +435,20 @@ unsigned int sleep (unsigned int seconds)
        return 0;
 }
+/*
+ * Windows' mktemp returns NULL on error whereas POSIX always returns the
+ * template and signals an error by making it an empty string.
+ */
+#undef mktemp
+char *mingw_mktemp(char *template)
+{
+        if ( mktemp(template) == NULL ) {
+                template[0] = '\0';
+        }
+        return template;
+}
 int mkstemp(char *template)
 {
        char *filename = mktemp(template);