X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ftempname.c;h=410213447c1e35a3a4fb600885f83f35768bf3f5;hb=0aa929caab127f13327b070132fff8a22d19bc75;hp=fd31acc4448255a4298a4a98552c5c7df51419e8;hpb=a8753bfd5b8e2d2d440febce6355fc719eb469b4;p=gnulib.git
diff --git a/lib/tempname.c b/lib/tempname.c
index fd31acc44..410213447 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -1,21 +1,21 @@
/* tempname.c - generate the name of a temporary file.
Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+ 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009 Free Software Foundation,
+ Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
/* Extracted from glibc sysdeps/posix/tempname.c. See also tmpdir.c. */
@@ -40,8 +40,7 @@
# define TMP_MAX 238328
#endif
#ifndef __GT_FILE
-# define __GT_FILE 0
-# define __GT_BIGFILE 1
+# define __GT_FILE 1
# define __GT_DIR 2
# define __GT_NOCREATE 3
#endif
@@ -51,11 +50,7 @@
#include
#include
-
-#if HAVE_SYS_TIME_H || _LIBC
-# include
-#endif
-
+#include
#include
#include
@@ -63,12 +58,9 @@
#if _LIBC
# define struct_stat64 struct stat64
-# define small_open __open
-# define large_open __open64
#else
# define struct_stat64 struct stat
-# define small_open open
-# define large_open open
+# define __open open
# define __gen_tempname gen_tempname
# define __getpid getpid
# define __gettimeofday gettimeofday
@@ -196,13 +188,11 @@ static const char letters[] =
at the time of the call.
__GT_FILE: create the file using open(O_CREAT|O_EXCL)
and return a read-write fd. The file is mode 0600.
- __GT_BIGFILE: same as __GT_FILE but use open64().
__GT_DIR: create a directory, which will be mode 0700.
We use a clever algorithm to get hard-to-predict names. */
-#if _LIBC || !HAVE___GEN_TEMPNAME
int
-__gen_tempname (char *tmpl, int kind)
+__gen_tempname (char *tmpl, int flags, int kind)
{
int len;
char *XXXXXX;
@@ -243,15 +233,11 @@ __gen_tempname (char *tmpl, int kind)
#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 ();
@@ -275,11 +261,9 @@ __gen_tempname (char *tmpl, int kind)
switch (kind)
{
case __GT_FILE:
- fd = small_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
- break;
-
- case __GT_BIGFILE:
- fd = large_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+ fd = __open (tmpl,
+ (flags & ~0777) | O_RDWR | O_CREAT | O_EXCL,
+ S_IRUSR | S_IWUSR);
break;
case __GT_DIR:
@@ -321,15 +305,3 @@ __gen_tempname (char *tmpl, int kind)
__set_errno (EEXIST);
return -1;
}
-
-#else /* !_LIBC && HAVE___GEN_TEMPNAME */
-
-# undef __gen_tempname
-extern int __gen_tempname (char *, int);
-int
-gen_tempname (char *tmpl, int kind)
-{
- return __gen_tempname (tmpl, kind);
-}
-
-#endif /* !_LIBC && HAVE___GEN_TEMPNAME */