Evil: add mkdtemp

2 files changed, 89 insertions, 28 deletions

diff --git a/src/lib/evil/evil_stdlib.c b/src/lib/evil/evil_stdlib.c
index ffd9acde9a..b7c814ec44 100644
--- a/src/lib/evil/evil_stdlib.c
+++ b/src/lib/evil/evil_stdlib.c
@@ -7,6 +7,7 @@
 #include <io.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include <errno.h>
 
@@ -269,51 +270,106 @@ unsetenv(const char *name)
  * Files related functions
  *
  */
+static int
+_mkstemp_init(char *__template, char **suffix, size_t *length, DWORD *val)
+{
+   *length = strlen(__template);
+   if ((*length < 6) ||
+       (strncmp (__template + *length - 6, "XXXXXX", 6)))
+     {
+        errno = EINVAL;
+        return 0;
+     }
 
-int
-mkstemp(char *__template)
+   *suffix = __template + *length - 6;
+
+   *val = GetTickCount();
+   *val += GetCurrentProcessId();
+
+   return 1;
+}
+
+static int
+_mkstemp(char *suffix, int val)
 {
    const char lookup[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+   DWORD v = val;
+
+   suffix[0] = lookup[v % 62];
+   v /= 62;
+   suffix[1] = lookup[v % 62];
+   v /= 62;
+   suffix[2] = lookup[v % 62];
+   v /= 62;
+   suffix[3] = lookup[v % 62];
+   v /= 62;
+   suffix[4] = lookup[v % 62];
+   v /= 62;
+   suffix[5] = lookup[v % 62];
+   v /= 62;
+
+   val += 7777;
+
+   return v;
+}
+
+EAPI char *
+mkdtemp(char *__template)
+{
    char      *suffix;
    DWORD      val;
    size_t     length;
    int        i;
 
    if (!__template)
-     return 0;
-
-   length = strlen(__template);
-   if ((length < 6) ||
-       (strncmp (__template + length - 6, "XXXXXX", 6)))
      {
         errno = EINVAL;
-        return -1;
+        return NULL;
      }
 
-   suffix = __template + length - 6;
+   if (!_mkstemp_init(__template, &suffix, &length, &val))
+     return NULL;
 
-   val = GetTickCount();
-   val += GetCurrentProcessId();
+   for (i = 0; i < 32768; i++)
+     {
+        val = _mkstemp(suffix, val);
+
+        if (mkdir(__template))
+          return __template;
+
+        if (errno == EFAULT ||
+            errno == ENOSPC ||
+            errno == ENOMEM ||
+            errno == ENOENT ||
+            errno == ENOTDIR ||
+            errno == EPERM ||
+            errno == EROFS)
+          return NULL;
+     }
+
+   errno = EEXIST;
+   return NULL;
+}
+
+int
+mkstemp(char *__template)
+{
+   char      *suffix;
+   DWORD      val;
+   size_t     length;
+   int        i;
+
+   if (!__template)
+     return 0;
+
+   if (!_mkstemp_init(__template, &suffix, &length, &val))
+     return -1;
 
    for (i = 0; i < 32768; i++)
      {
-        DWORD v;
         int fd;
 
-        v = val;
-
-        suffix[0] = lookup[v % 62];
-        v /= 62;
-        suffix[1] = lookup[v % 62];
-        v /= 62;
-        suffix[2] = lookup[v % 62];
-        v /= 62;
-        suffix[3] = lookup[v % 62];
-        v /= 62;
-        suffix[4] = lookup[v % 62];
-        v /= 62;
-        suffix[5] = lookup[v % 62];
-        v /= 62;
+        val = _mkstemp(suffix, val);
 
 #ifndef __MINGW32CE__
         fd = _open(__template, _O_RDWR | _O_BINARY | _O_CREAT | _O_EXCL, _S_IREAD | _S_IWRITE);
@@ -337,8 +393,6 @@ mkstemp(char *__template)
 #endif /* __MINGW32CE__ */
         if (fd >= 0)
           return fd;
-
-        val += 7777;
      }
 
    errno = EEXIST;
diff --git a/src/lib/evil/evil_stdlib.h b/src/lib/evil/evil_stdlib.h
index b102b66f8e..52318dc964 100644
--- a/src/lib/evil/evil_stdlib.h
+++ b/src/lib/evil/evil_stdlib.h
@@ -160,6 +160,13 @@ EAPI int unsetenv(const char *name);
 EAPI int mkstemp(char *__template);
 
 /**
+ * @brief create an unique temporary directory
+ *
+ * @since 1.8.0
+ */
+EAPI char *mkdtemp(char *__template);
+
+/**
  * @brief Return an absolute or full path name for a specified relative path name.
  *
  * @param file_name The absolute path name.