mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
7cabd57c0d
1998-08-03 16:36 Ulrich Drepper <drepper@cygnus.com> * catgets/catgets.c: Use mmap/munmap only is _POSIX_MAPPED_FILES is defined. * catgets/open_catalog.c: Likewise. * iconv/iconv_prog.c: Likewise. * intl/loadmsgcat.c: Likewise. * locale/findlocale.c: Likewise. * locale/loadlocale.c: Likewise. * locale/programs/localedef.c: Likewise. * malloc/malloc.c: Likewise. * elf/elf.h: Fix typo. * math/Makefile: Use $(LN_S) instead of ln. * sysdeps/generic/getpgid.c: Fix return type. 1998-08-01 02:49 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/posix/tempname.c (__stdio_gen_tempname): Rename to __gen_tempname and simplify the interface. Strip out the code to do path search and create FILE objects. This function now takes a mktemp() style template and returns either a name or a file descriptor. (__path_search): New function; searches for directories for temp files. * sysdeps/generic/tempname.c: Stub out __gen_tempname and __path_search, not __stdio_gen_tempname. * libio/stdio.h: Prototype __gen_tempname and __path_search, not __stdio_gen_tempname. * stdio/stdio.h: Likewise. * stdio-common/tempnam.c: Use __path_search and __gen_tempname. * stdio-common/tmpfile.c: Likewise. * stdio-common/tmpfile64.c: Likewise. * stdio-common/tmpnam.c: Likewise. * stdio-common/tmpnam_r.c: Likewise. * misc/mkstemp.c: New file. Use __gen_tempname. * misc/mktemp.c: Likewise. * sysdeps/posix/mkstemp.c: Removed. * sysdeps/posix/mktemp.c: Removed. * sysdeps/generic/mkstemp.c: Removed. * sysdeps/generic/mktemp.c: Removed. 1998-08-02 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * configure.in: Check, if door add-on is installed. * config.make.in: Add have_doors. * sunrpc/Makefile: Add HAVE_DOOR define. * sunrpc/key_call.c: Add keyserv/door interface. * sunrpc/svc_unix.c: Call setsockopt only if SO_PASSCRED is defined. * sunrpc/clnt_unix.c: Likewise. 1998-08-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * inet/netinet/in.h (IN_CLASSC): Correct mask. Reported by Ian Staniforth <I.Staniforth@sheffield.ac.uk> [fixes PR libc/727]. 1998-08-03 10:23 Ulrich Drepper <drepper@cygnus.com> * misc/Makefile: Fix installation problem with --disable-shared. * posix/Makefile: Likewise. 1998-08-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/regex.c (re_search_2): Optimize searching for anchored pattern if '^' cannot match at embedded newlines. (regerror): Renamed from __regerror, which it should only be called if _LIBC. 1998-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/svc_unix.c (__msgread): Check setsockopt return value. 1998-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/glob.c: Remove obsolete cast. 1998-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules (tests): Fix last change.
188 lines
5.0 KiB
C
188 lines
5.0 KiB
C
/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <sys/time.h>
|
|
|
|
/* Return nonzero if DIR is an existent directory. */
|
|
static int
|
|
direxists (const char *dir)
|
|
{
|
|
struct stat buf;
|
|
return __stat (dir, &buf) == 0 && S_ISDIR (buf.st_mode);
|
|
}
|
|
|
|
/* Path search algorithm, for tmpnam, tmpfile, etc. If DIR is
|
|
non-null and exists, uses it; otherwise uses the first of $TMPDIR,
|
|
P_tmpdir, /tmp that exists. Copies into TMPL a template suitable
|
|
for use with mk[s]temp. Will fail (-1) if DIR is non-null and
|
|
doesn't exist, none of the searched dirs exists, or there's not
|
|
enough space in TMPL. */
|
|
int
|
|
__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx)
|
|
{
|
|
const char *d;
|
|
size_t dlen, plen;
|
|
|
|
if (!pfx || !pfx[0])
|
|
{
|
|
pfx = "file";
|
|
plen = 4;
|
|
}
|
|
else
|
|
{
|
|
plen = strlen (pfx);
|
|
if (plen > 5)
|
|
plen = 5;
|
|
}
|
|
|
|
d = __secure_getenv ("TMPDIR");
|
|
if (d != NULL && direxists (d))
|
|
dir = d;
|
|
else if (dir != NULL && direxists (dir))
|
|
/* nothing */ ;
|
|
else if (direxists (P_tmpdir))
|
|
dir = P_tmpdir;
|
|
else if (direxists ("/tmp"))
|
|
dir = "/tmp";
|
|
else
|
|
{
|
|
__set_errno (ENOENT);
|
|
return -1;
|
|
}
|
|
|
|
dlen = strlen (dir);
|
|
while (dlen > 1 && dir[dlen - 1] == '/')
|
|
dlen--; /* remove trailing slashes */
|
|
|
|
/* check we have room for "${dir}/${pfx}XXXXXX\0" */
|
|
if (tmpl_len < dlen + 1 + plen + 6 + 1)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
sprintf (tmpl, "%*s/%*sXXXXXX", dlen, dir, plen, pfx);
|
|
return 0;
|
|
}
|
|
|
|
/* 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. If OPENIT is nonzero, creates the
|
|
file and returns a read-write fd; the file is mode 0600 modulo
|
|
umask. If LARGEFILE is nonzero, uses open64() instead of open().
|
|
|
|
We use a clever algorithm to get hard-to-predict names. */
|
|
int
|
|
__gen_tempname (char *tmpl, int openit, int largefile)
|
|
{
|
|
int len;
|
|
char *XXXXXX;
|
|
static uint64_t value;
|
|
struct timeval tv;
|
|
int count, fd;
|
|
int save_errno = errno;
|
|
|
|
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. */
|
|
__gettimeofday (&tv, NULL);
|
|
value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ __getpid ();
|
|
|
|
for (count = 0; count < TMP_MAX; 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];
|
|
|
|
if (openit)
|
|
{
|
|
/* XXX Do we want to fail on largefile if 64 bit fileops
|
|
are not implemented, or just fall back to the old stuff? */
|
|
#ifndef __stub_open64
|
|
fd = (largefile
|
|
? __open (tmpl, O_RDWR | O_CREAT | O_EXCL, 0666)
|
|
: __open64 (tmpl, O_RDWR | O_CREAT | O_EXCL, 0666));
|
|
#else
|
|
fd = __open (tmpl, O_RDWR | O_CREAT | O_EXCL, 0666);
|
|
#endif
|
|
if (fd >= 0)
|
|
{
|
|
__set_errno (save_errno);
|
|
return fd;
|
|
}
|
|
else if (errno != EEXIST)
|
|
/* Any other error will apply also to other names we might
|
|
try, and there are 2^32 or so of them, so give up now. */
|
|
return -1;
|
|
}
|
|
else
|
|
{
|
|
struct stat st;
|
|
if (__stat (tmpl, &st) < 0)
|
|
{
|
|
if (errno == ENOENT)
|
|
{
|
|
__set_errno (save_errno);
|
|
return 0;
|
|
}
|
|
else
|
|
/* Give up now. */
|
|
return -1;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* We got out of the loop because we ran out of combinations to try. */
|
|
__set_errno (EEXIST);
|
|
return -1;
|
|
}
|