Re: mingw conflict between mkdtemp and sys_stat

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> The second half, fixing mkdtemp to use the new tempname module and the
> existing sys_stat module, so that mkdtemp and mkstemp can coexist on
> mingw, still needs Bruno's approval; I'll post that patch later in light
> of this commit.  And I need mkdtemp fixed before I can release M4 1.4.8;
> I'm hoping I don't need to use a gnulib-tool --local-dir workaround if I
> can avoid it.  (Hmm, gnulib-tool --help doesn't document --local-dir).

Bruno, okay to commit?

2006-10-27  Eric Blake  <address@hidden>

        * modules/tmpdir (Depends-on): Add sys_stat.
        * modules/mkdtemp (Depends-on): Add tempname, drop unistd.
        * lib/mkdtemp.c (gen_tempname): Remove; tempname covers this.
        * lib/tmpdir.c (S_ISDIR): Simplify, thanks to sys_stat.
        * m4/mkdtemp.m4 (gl_PREREQ_MKDTEMP): Simplify, thanks to tempname.

Index: modules/mkdtemp
===================================================================
RCS file: /sources/gnulib/gnulib/modules/mkdtemp,v
retrieving revision 1.6
diff -u -r1.6 mkdtemp
--- modules/mkdtemp     13 Oct 2006 12:40:23 -0000      1.6
+++ modules/mkdtemp     27 Oct 2006 15:07:14 -0000
@@ -8,7 +8,7 @@
 
 Depends-on:
 stdint
-unistd
+tempname
 
 configure.ac:
 gt_FUNC_MKDTEMP
Index: modules/tmpdir
===================================================================
RCS file: /sources/gnulib/gnulib/modules/tmpdir,v
retrieving revision 1.2
diff -u -r1.2 tmpdir
--- modules/tmpdir      15 Aug 2006 11:53:54 -0000      1.2
+++ modules/tmpdir      27 Oct 2006 15:07:14 -0000
@@ -8,6 +8,7 @@
 
 Depends-on:
 stdbool
+sys_stat
 
 configure.ac:
 gt_TMPDIR
Index: m4/mkdtemp.m4
===================================================================
RCS file: /sources/gnulib/gnulib/m4/mkdtemp.m4,v
retrieving revision 1.4
diff -u -r1.4 mkdtemp.m4
--- m4/mkdtemp.m4       11 Sep 2006 12:35:15 -0000      1.4
+++ m4/mkdtemp.m4       27 Oct 2006 15:07:14 -0000
@@ -14,9 +14,5 @@
 
 # Prerequisites of lib/mkdtemp.c
 AC_DEFUN([gl_PREREQ_MKDTEMP],
-[
-  AC_REQUIRE([AC_HEADER_STAT])
-  AC_CHECK_HEADERS_ONCE(sys/time.h unistd.h)
-  AC_CHECK_HEADERS(time.h)
-  AC_CHECK_FUNCS(gettimeofday)
+[:
 ])
Index: lib/mkdtemp.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/mkdtemp.c,v
retrieving revision 1.12
diff -u -r1.12 mkdtemp.c
--- lib/mkdtemp.c       20 Sep 2006 20:18:02 -0000      1.12
+++ lib/mkdtemp.c       27 Oct 2006 15:07:14 -0000
@@ -15,183 +15,15 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
+/* Extracted from misc/mkdtemp.c.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include "mkdtemp.h"
 
-#include <errno.h>
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
-
-#include <stddef.h>
-#include <stdint.h>
+#include "tempname.h"
 #include <stdlib.h>
-#include <string.h>
-
-#include <stdio.h>
-#ifndef TMP_MAX
-# define TMP_MAX 238328
-#endif
-
-#include <unistd.h>
-
-#if HAVE_GETTIMEOFDAY || _LIBC
-# if HAVE_SYS_TIME_H || _LIBC
-#  include <sys/time.h>
-# endif
-#else
-# if HAVE_TIME_H || _LIBC
-#  include <time.h>
-# endif
-#endif
-
-#include <sys/stat.h>
-#if !defined S_ISDIR && defined S_IFDIR
-# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
-#endif
-#if !S_IRUSR && S_IREAD
-# define S_IRUSR S_IREAD
-#endif
-#if !S_IRUSR
-# define S_IRUSR 00400
-#endif
-#if !S_IWUSR && S_IWRITE
-# define S_IWUSR S_IWRITE
-#endif
-#if !S_IWUSR
-# define S_IWUSR 00200
-#endif
-#if !S_IXUSR && S_IEXEC
-# define S_IXUSR S_IEXEC
-#endif
-#if !S_IXUSR
-# define S_IXUSR 00100
-#endif
-
-#ifdef __MINGW32__
-# include <io.h>
-/* mingw's _mkdir() function has 1 argument, but we pass 2 arguments.
-   Therefore we have to disable the argument count checking.  */
-# define mkdir ((int (*)()) _mkdir)
-#endif
-
-#if !_LIBC
-# define __getpid getpid
-# define __gettimeofday gettimeofday
-# define __mkdir mkdir
-#endif
-
-/* Use the widest available unsigned type if uint64_t is not
-   available.  The algorithm below extracts a number less than 62**6
-   (approximately 2**35.725) from uint64_t, so ancient hosts where
-   uintmax_t is only 32 bits lose about 3.725 bits of randomness,
-   which is better than not having mkstemp at all.  */
-#if !defined UINT64_MAX && !defined uint64_t
-# define uint64_t uintmax_t
-#endif
-
-/* These are the characters used in temporary filenames.  */
-static const char letters[] =
-"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-/* Generate a temporary file name based on TMPL.  TMPL must match the
-   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
-   does not exist at the time of the call to __gen_tempname.  TMPL is
-   overwritten with the result.
-
-   KIND is:
-   __GT_DIR:           create a directory, which will be mode 0700.
-
-   We use a clever algorithm to get hard-to-predict names. */
-static int
-gen_tempname (char *tmpl)
-{
-  int len;
-  char *XXXXXX;
-  static uint64_t value;
-  uint64_t random_time_bits;
-  unsigned int count;
-  int fd = -1;
-  int save_errno = errno;
-
-  /* A lower bound on the number of temporary files to attempt to
-     generate.  The maximum total number of temporary file names that
-     can exist for a given template is 62**6.  It should never be
-     necessary to try all these combinations.  Instead if a reasonable
-     number of names is tried (we define reasonable as 62**3) fail to
-     give the system administrator the chance to remove the problems.  */
-#define ATTEMPTS_MIN (62 * 62 * 62)
-
-  /* The number of times to attempt to generate a temporary file.  To
-     conform to POSIX, this must be no smaller than TMP_MAX.  */
-#if ATTEMPTS_MIN < TMP_MAX
-  unsigned int attempts = TMP_MAX;
-#else
-  unsigned int attempts = ATTEMPTS_MIN;
-#endif
-
-  len = strlen (tmpl);
-  if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  /* This is where the Xs start.  */
-  XXXXXX = &tmpl[len - 6];
-
-  /* Get some more or less random data.  */
-#ifdef RANDOM_BITS
-  RANDOM_BITS (random_time_bits);
-#else
-# if HAVE_GETTIMEOFDAY || _LIBC
-  {
-    struct timeval tv;
-    __gettimeofday (&tv, NULL);
-    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
-  }
-# else
-  random_time_bits = time (NULL);
-# endif
-#endif
-  value += random_time_bits ^ __getpid ();
-
-  for (count = 0; count < attempts; value += 7777, ++count)
-    {
-      uint64_t v = value;
-
-      /* Fill in the random bits.  */
-      XXXXXX[0] = letters[v % 62];
-      v /= 62;
-      XXXXXX[1] = letters[v % 62];
-      v /= 62;
-      XXXXXX[2] = letters[v % 62];
-      v /= 62;
-      XXXXXX[3] = letters[v % 62];
-      v /= 62;
-      XXXXXX[4] = letters[v % 62];
-      v /= 62;
-      XXXXXX[5] = letters[v % 62];
-
-      fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
-
-      if (fd >= 0)
-       {
-         __set_errno (save_errno);
-         return fd;
-       }
-      else if (errno != EEXIST)
-       return -1;
-    }
-
-  /* We got out of the loop because we ran out of combinations to try.  */
-  __set_errno (EEXIST);
-  return -1;
-}
 
 /* Generate a unique temporary directory from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
@@ -201,7 +33,7 @@
 char *
 mkdtemp (char *template)
 {
-  if (gen_tempname (template))
+  if (gen_tempname (template, GT_DIR))
     return NULL;
   else
     return template;
Index: lib/tmpdir.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/tmpdir.c,v
retrieving revision 1.3
diff -u -r1.3 tmpdir.c
--- lib/tmpdir.c        14 Sep 2006 14:18:36 -0000      1.3
+++ lib/tmpdir.c        27 Oct 2006 15:07:14 -0000
@@ -37,27 +37,6 @@
 #endif
 
 #include <sys/stat.h>
-#if !defined S_ISDIR && defined S_IFDIR
-# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
-#endif
-#if !S_IRUSR && S_IREAD
-# define S_IRUSR S_IREAD
-#endif
-#if !S_IRUSR
-# define S_IRUSR 00400
-#endif
-#if !S_IWUSR && S_IWRITE
-# define S_IWUSR S_IWRITE
-#endif
-#if !S_IWUSR
-# define S_IWUSR 00200
-#endif
-#if !S_IXUSR && S_IEXEC
-# define S_IXUSR S_IEXEC
-#endif
-#if !S_IXUSR
-# define S_IXUSR 00100
-#endif
 
 #if _LIBC
 # define struct_stat64 struct stat64