mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
f8b87ef0d4
Thu Dec 12 03:32:21 1996 Ulrich Drepper <drepper@cygnus.com> * libio/_G_config.h: Add definition of _G_int16_t, _G_int32_t, _G_uint16_t, _G_uin32_t, _G_HAVE_BOOL, _G_HAVE_MMAP, and _G_ARGS. Change libio buffer handling to allocate internal buffers using mmap if possible. * libio/filedoalloc.c (_IO_file_doallocate): Change call to ALLOC_BUF. * libio/genops.c (_IO_setb, _IO_default_finish): Change call to FREE_BUF. (_IO_default_doallocate): Change call to ALLOC_BUF. * libio/libioP.h: Change definition of ALLOC_BUF and FREE_BUF to use mmap/munmap when possible. * libio/memstream.c: Don't use ALLOC_BUF, but directly malloc. * libio/vasprintf.c: Likewise. Patch by HJ Lu. * libio/libio.h: Define NULL as __null only for gcc-2.8 and up. * libio/libioP.h: Likewise. * libio/fileops.c (_IO_file_read, _IO_file_write): Don't restart syscall when EINTR was returned. Necessary for POSIX.1. * libio/strops.c (_IO_str_overflow): Add cast to prevent warning. * new-malloc/malloc.c (heap_trim): Correctly place parentheses to prevent warnings. * nis/Makefile: Remove rules for bsd-tools which are not part of glibc. Patch by Thorsten Kukuk. * nis/ypclnt.c: Add prototype for xdr_free. Add const to first parameter for __yp_bind. * nis/nss_compat/compat-pwd.c (getpwent_next_netgr, getpwent_next_nis, getpwent_next_file): Variable `p2len' must have type size_t. * nis/nss_nis/nis-alias.c: Add casts to prevent warnings. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/rpcsvc/yp_prot.h (ypreq_key): Change type of members to `const char *'. (ypmaplist): Change member names to `map' and `next' and provide #defines for old names. Patch by Thorsten Kukuk. * nss/nss_files/files-parse.c (parse_line, parse_list): Change type for `datalen' parameter to size_t. * shsdow/lckpwdf.c: Use fcntl forlocking, not flock. * stdio-common/printf.c [USE_IN_LIBIO]: Provide alias _IO_printf for printf. * stdio-common/sscanf.c [USE_IN_LIBIO]: Provide alias _IO_sscanf for sscanf. Patch by HJ Lu. * stdio-common/tmpfile.c: Update copyright. * stdio-common/vfscanf.c: Correctly handle EINTR error from fgetc function. Don't eat white space for `C' format. * stdlib/tst-strtol.c [~0UL != 0xffffffff]: Fix typo in test data. * sysdeps/generic/abort.c: Update copyright. De-ANSI-declfy. * sysdeps/i386/abort.c: Removed. This version does not use signal SIGABRT. * sysdeps/i386/fpu/__math.h: Define __NO_MATH_INLINES if not using gcc-2.8 or up. Patch by HJ Lu. * sysdeps/posix/tempname.c: Test for error but EEXIST after open call. If EMFILE, ENFILE, or EINTR return with error. Wed Dec 11 14:43:52 1996 Ulrich Drepper <drepper@cygnus.com> * gnu-versions.h: Set _GNU_OBSTACK_INTERFACE_VERSION back to 1. We are compatible again. * new-malloc/obstack.h (struct obstack): Add back alloc_failed bit even though it is not used. * malloc/obstack.h: Likewise. * new-malloc/obstack.c (_obstack_begin, _obstack_begin_1): Initialize alloc_failed bit to 0. * time/strftime.c: Extend for Emacs' needs. Recognize field width, %P format and `0' modifier. Tue Dec 10 21:20:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (make-link): Don't discard exit codes of intermediate commands. Always use rellns-sh if symbolic links are available. Tue Dec 10 20:09:51 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/netinet/in.h: Enclose #include <linux/in.h> in __BEGIN_DECLS/__END_DECLS to avoid linkage conflict of ntohs etc. in <asm/byteorder.h>.
293 lines
8.0 KiB
C
293 lines
8.0 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
# include "libioP.h"
|
|
# include <libio.h>
|
|
#endif
|
|
|
|
/* Return nonzero if DIR is an existent directory. */
|
|
static int
|
|
diraccess (const char *dir)
|
|
{
|
|
struct stat buf;
|
|
return __stat (dir, &buf) == 0 && S_ISDIR (buf.st_mode);
|
|
}
|
|
|
|
/* Return nonzero if FILE exists. */
|
|
static int
|
|
exists (const char *file)
|
|
{
|
|
/* We can stat the file even if we can't read its data. */
|
|
struct stat st;
|
|
int save = errno;
|
|
if (__stat (file, &st) == 0)
|
|
return 1;
|
|
else
|
|
{
|
|
/* We report that the file exists if stat failed for a reason other
|
|
than nonexistence. In this case, it may or may not exist, and we
|
|
don't know; but reporting that it does exist will never cause any
|
|
trouble, while reporting that it doesn't exist when it does would
|
|
violate the interface of __stdio_gen_tempname. */
|
|
int exists = errno != ENOENT;
|
|
__set_errno (save);
|
|
return exists;
|
|
}
|
|
}
|
|
|
|
|
|
/* These are the characters used in temporary filenames. */
|
|
static const char letters[] =
|
|
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
|
|
|
|
/* Generate a temporary filename and return it (in a static buffer). If
|
|
STREAMPTR is not NULL, open a stream "w+b" on the file and set
|
|
*STREAMPTR to it. If DIR_SEARCH is nonzero, DIR and PFX are used as
|
|
described for tempnam. If not, a temporary filename in P_tmpdir with no
|
|
special prefix is generated. If LENPTR is not NULL, *LENPTR is set the
|
|
to length (including the terminating '\0') of the resultant filename,
|
|
which is returned. This goes through a cyclic pattern of all possible
|
|
filenames consisting of five decimal digits of the current pid and three
|
|
of the characters in `letters'. Data for tempnam and tmpnam is kept
|
|
separate, but when tempnam is using P_tmpdir and no prefix (i.e, it is
|
|
identical to tmpnam), the same data is used. Each potential filename is
|
|
tested for an already-existing file of the same name, and no name of an
|
|
existing file will be returned. When the cycle reaches its end
|
|
(12345ZZZ), NULL is returned. */
|
|
char *
|
|
__stdio_gen_tempname (char *buf, size_t bufsize, const char *dir,
|
|
const char *pfx, int dir_search, size_t *lenptr,
|
|
FILE **streamptr)
|
|
{
|
|
int saverrno = errno;
|
|
static const char tmpdir[] = P_tmpdir;
|
|
static size_t indices[2];
|
|
size_t *idx;
|
|
#if 0
|
|
static pid_t oldpid = (pid_t) 0;
|
|
#endif
|
|
pid_t pid = __getpid();
|
|
register size_t len, plen, dlen;
|
|
int wrapped;
|
|
|
|
if (dir_search)
|
|
{
|
|
register const char *d = __secure_getenv ("TMPDIR");
|
|
if (d != NULL && !diraccess (d))
|
|
d = NULL;
|
|
if (d == NULL && dir != NULL && diraccess (dir))
|
|
d = dir;
|
|
if (d == NULL && diraccess (tmpdir))
|
|
d = tmpdir;
|
|
if (d == NULL && diraccess ("/tmp"))
|
|
d = "/tmp";
|
|
if (d == NULL)
|
|
{
|
|
__set_errno (ENOENT);
|
|
return NULL;
|
|
}
|
|
dir = d;
|
|
}
|
|
else
|
|
dir = tmpdir;
|
|
|
|
dlen = strlen (dir);
|
|
|
|
/* Remove trailing slashes from the directory name. */
|
|
while (dlen > 1 && dir[dlen - 1] == '/')
|
|
--dlen;
|
|
|
|
if (pfx != NULL && *pfx != '\0')
|
|
{
|
|
plen = strlen (pfx);
|
|
if (plen > 5)
|
|
plen = 5;
|
|
}
|
|
else
|
|
plen = 0;
|
|
|
|
if (dir != tmpdir && !strcmp (dir, tmpdir))
|
|
dir = tmpdir;
|
|
idx = &indices[(plen == 0 && dir == tmpdir) ? 1 : 0];
|
|
|
|
#if 0
|
|
/* XXX Is this ever useful??? At least when using a thread package
|
|
which uses different PIDs for the threads it is not helpful. */
|
|
if (pid != oldpid)
|
|
{
|
|
oldpid = pid;
|
|
indices[0] = indices[1] = 0;
|
|
}
|
|
#endif
|
|
|
|
wrapped = 0; /* We have not yet wrapped around the index counter. */
|
|
len = dlen + 1 + plen + 5 + 3;
|
|
while (1)
|
|
{
|
|
size_t i;
|
|
|
|
if (*idx >= ((sizeof (letters) - 1) * (sizeof (letters) - 1) *
|
|
(sizeof (letters) - 1)))
|
|
{
|
|
if (wrapped)
|
|
/* We really wrapped around this call. Can't believe it
|
|
but nevertheless stop the endless loop. */
|
|
break;
|
|
|
|
indices[0] = indices[1] = 0;
|
|
wrapped = 1;
|
|
}
|
|
|
|
i = (*idx)++;
|
|
|
|
/* Construct a file name and see if it already exists.
|
|
|
|
We use a single counter in *IDX to cycle each of three
|
|
character positions through each of 62 possible letters. */
|
|
|
|
if (__snprintf (buf, bufsize, "%.*s/%.*s%.5d%c%c%c",
|
|
(int) dlen, dir, (int) plen,
|
|
pfx, pid % 100000,
|
|
letters[i % (sizeof (letters) - 1)],
|
|
letters[(i / (sizeof (letters) - 1))
|
|
% (sizeof (letters) - 1)],
|
|
letters[(i / ((sizeof (letters) - 1) *
|
|
(sizeof (letters) - 1)))
|
|
% (sizeof (letters) - 1)]
|
|
) != (int) len)
|
|
return NULL;
|
|
|
|
if (streamptr != NULL)
|
|
{
|
|
/* Try to create the file atomically. */
|
|
int fd = __open (buf, O_RDWR|O_CREAT|O_EXCL, 0666);
|
|
if (fd >= 0)
|
|
{
|
|
/* We got a new file that did not previously exist.
|
|
Create a stream for it. */
|
|
#ifdef USE_IN_LIBIO
|
|
int save;
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_FILE_plus fp;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
} *new_f;
|
|
struct _IO_FILE_plus *fp;
|
|
|
|
new_f = (struct locked_FILE *)
|
|
malloc (sizeof (struct locked_FILE));
|
|
if (new_f == NULL)
|
|
{
|
|
/* We lost trying to create a stream (out of memory?).
|
|
Nothing to do but remove the file, close the descriptor,
|
|
and return failure. */
|
|
save = errno;
|
|
lose:
|
|
(void) remove (buf);
|
|
(void) __close (fd);
|
|
__set_errno (save);
|
|
return NULL;
|
|
}
|
|
fp = &new_f->fp;
|
|
#ifdef _IO_MTSAFE_IO
|
|
fp->file._lock = &new_f->lock;
|
|
#endif
|
|
_IO_init (&fp->file, 0);
|
|
_IO_JUMPS (&fp->file) = &_IO_file_jumps;
|
|
_IO_file_init (&fp->file);
|
|
# if !_IO_UNIFIED_JUMPTABLES
|
|
fp->vtable = NULL;
|
|
# endif
|
|
if (_IO_file_attach (&fp->file, fd) == NULL)
|
|
{
|
|
save = errno;
|
|
free (fp);
|
|
goto lose;
|
|
}
|
|
fp->file._flags &= ~_IO_DELETE_DONT_CLOSE;
|
|
|
|
*streamptr = (FILE *) fp;
|
|
#else
|
|
*streamptr = __newstream ();
|
|
if (*streamptr == NULL)
|
|
{
|
|
/* We lost trying to create a stream (out of memory?).
|
|
Nothing to do but remove the file, close the descriptor,
|
|
and return failure. */
|
|
const int save = errno;
|
|
(void) remove (buf);
|
|
(void) __close (fd);
|
|
__set_errno (save);
|
|
return NULL;
|
|
}
|
|
(*streamptr)->__cookie = (__ptr_t) (long int) fd;
|
|
(*streamptr)->__mode.__write = 1;
|
|
(*streamptr)->__mode.__read = 1;
|
|
(*streamptr)->__mode.__binary = 1;
|
|
#endif
|
|
}
|
|
#if defined EMFILE || defined ENFILE || defined EINTR
|
|
else if (0
|
|
# ifdef EMFILE
|
|
|| errno == EMFILE
|
|
# endif
|
|
# ifdef ENFILE
|
|
|| errno == ENFILE
|
|
# endif
|
|
# ifdef EINTR
|
|
|| errno == EINTR
|
|
# endif
|
|
)
|
|
/* We cannot open anymore files since all descriptors are
|
|
used or because we got a signal. */
|
|
return NULL;
|
|
#endif
|
|
else
|
|
continue;
|
|
}
|
|
else if (exists (buf))
|
|
continue;
|
|
|
|
/* If the file already existed we have continued the loop above,
|
|
so we only get here when we have a winning name to return. */
|
|
|
|
__set_errno (saverrno);
|
|
|
|
if (lenptr != NULL)
|
|
*lenptr = len + 1;
|
|
return buf;
|
|
}
|
|
|
|
/* We got out of the loop because we ran out of combinations to try. */
|
|
__set_errno (EEXIST); /* ? */
|
|
return NULL;
|
|
}
|