From 81a77bddc1480a21aa73bf3a257de3c33964aef2 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 1 Nov 2006 03:46:10 +0000 Subject: [PATCH] * 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. --- ChangeLog | 9 +++ lib/mkdtemp.c | 174 +------------------------------------------------------- lib/tmpdir.c | 21 ------- m4/mkdtemp.m4 | 6 +- modules/mkdtemp | 2 +- modules/tmpdir | 1 + 6 files changed, 15 insertions(+), 198 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a84568b5..cd1e95035 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-10-31 Eric Blake + + * 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. + 2006-10-31 Paul Eggert Avoid some C++ diagnostics reported by Bruno Haible. diff --git a/lib/mkdtemp.c b/lib/mkdtemp.c index 60bbd0aa4..e916d385b 100644 --- a/lib/mkdtemp.c +++ b/lib/mkdtemp.c @@ -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 /* Specification. */ #include "mkdtemp.h" -#include -#ifndef __set_errno -# define __set_errno(Val) errno = (Val) -#endif - -#include -#include +#include "tempname.h" #include -#include - -#include -#ifndef TMP_MAX -# define TMP_MAX 238328 -#endif - -#include - -#if HAVE_GETTIMEOFDAY || _LIBC -# if HAVE_SYS_TIME_H || _LIBC -# include -# endif -#else -# if HAVE_TIME_H || _LIBC -# include -# endif -#endif - -#include -#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 -/* 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 @@ gen_tempname (char *tmpl) char * mkdtemp (char *template) { - if (gen_tempname (template)) + if (gen_tempname (template, GT_DIR)) return NULL; else return template; diff --git a/lib/tmpdir.c b/lib/tmpdir.c index 3e22eeff5..d29a00578 100644 --- a/lib/tmpdir.c +++ b/lib/tmpdir.c @@ -37,27 +37,6 @@ #endif #include -#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 diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4 index e39bcb938..fafc98e4c 100644 --- a/m4/mkdtemp.m4 +++ b/m4/mkdtemp.m4 @@ -14,9 +14,5 @@ AC_DEFUN([gt_FUNC_MKDTEMP], # 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) +[: ]) diff --git a/modules/mkdtemp b/modules/mkdtemp index b9e32389c..8ea9658ea 100644 --- a/modules/mkdtemp +++ b/modules/mkdtemp @@ -8,7 +8,7 @@ m4/mkdtemp.m4 Depends-on: stdint -unistd +tempname configure.ac: gt_FUNC_MKDTEMP diff --git a/modules/tmpdir b/modules/tmpdir index d22e66346..a42fdc45b 100644 --- a/modules/tmpdir +++ b/modules/tmpdir @@ -8,6 +8,7 @@ m4/tmpdir.m4 Depends-on: stdbool +sys_stat configure.ac: gt_TMPDIR -- 2.11.0