mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
10dc2a90b7
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996. The stream is private and usages outside glibc don't care about reentrancy. * io/fts.c: Likewise. * io/ftw.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/glob.c: Likewise. * libio/iovsprintf.c: Add cast to prevent warning. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Define mmap to __mmap and munmap to __munmap to keep namespace clean. * new-malloc/malloc.c: Update to last version from Wolfram Gloger. Add hooks and check functions from old GNU malloc. * new-malloc/malloc.h: Likewise. * nis/ypclnt.c: Remove prototype for xdr_free. * snrpc/rpc/xdr.h: Add prototype for xdr_free. * manual/nss.texi: Correct description of default values and don't meantion NSS as an add-on. * nss/grp-lookup.c: Provide default value as "compat [NOTFOUND=return] files". * nss/pwd-lookup.c: Likewise. * nss/spwd-lookup.c: Likewise. * nss/network-lookup.c: Correct default to "dns [!UNAVAIL=return] files". * nss/nsswitch.c: Change default-default value to "nis [NOTFOUND=return] files" since compat is only available for group, passwd, and shadow. * stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name a weak alias. * stdlib/stdlib.h: Add prototype for __on_exit. * sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone. * time/Makefile: Undo change from Sun Dec 8 06:56:49 1996. The new malloc now has mcheck. * time/ap.c: Likewise. * time/tzset.c (__tzset): Rename to __tzset_internal. (tzset): Rename to __tzset. Make tzset a weak alias for __tzset. * time/localtime.c: Use __tzset_internal not __tzset. * time/strftime.c [_LIBC]: Define tzname as __tzname and tzset as __tzset to prevent namespace pollution. * wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype a weak alias of __iswctype. * wctype/wctype.h: Add prototype for __iswctype. (iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank): Use __iswctype for the test, not iswctype. 1996-12-16 Paul Eggert <eggert@twinsun.com> * hurd/hurd/sigpreempt.h (struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors), hurd/hurd/signal.h (struct hurd_sigstate.preemptors), hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor), hurd/hurdsig.c (_hurdsig_preempters): Renamed to fix spelling from `preempter' to `preemptor'. All uses changed. 1996-12-15 Paul Eggert <eggert@twinsun.com> * ctime.c (ctime): Return asctime (localtime (t)), as the C standard requires. Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return value because Mach/cthreads uses the opposite convention from Posix/glibc. Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com> * stdio-common/fcloseall.c: Correct test of already_called. Reported by Thomas Bushnell, n/BSG. Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * mach/lock-intern.h (__mutex_try_lock): New function. Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if defined, else XTABS. (CEOL, CSTATUS): Use _POSIX_VDISABLE if defined. Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/mremap.S: New file. * sysdeps/unix/sysv/linux/m68k/Dist: Distribute it. * sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
382 lines
8.2 KiB
C
382 lines
8.2 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., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
/* Wants:
|
||
AC_STDC_HEADERS
|
||
AC_DIR_HEADER
|
||
AC_UNISTD_H
|
||
AC_MEMORY_H
|
||
AC_CONST
|
||
AC_ALLOCA
|
||
*/
|
||
|
||
/* AIX requires this to be the first thing in the file. */
|
||
#if defined (_AIX) && !defined (__GNUC__)
|
||
#pragma alloca
|
||
#endif
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include "config.h"
|
||
#endif
|
||
|
||
#include <errno.h>
|
||
#include <sys/types.h>
|
||
#include <sys/stat.h>
|
||
|
||
#ifdef STDC_HEADERS
|
||
#include <stddef.h>
|
||
#endif
|
||
|
||
#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
|
||
extern int errno;
|
||
#endif
|
||
#ifndef __set_errno
|
||
#define __set_errno(val) errno = (val)
|
||
#endif
|
||
|
||
#ifndef NULL
|
||
#define NULL 0
|
||
#endif
|
||
|
||
#if defined (USGr3) && !defined (DIRENT)
|
||
#define DIRENT
|
||
#endif /* USGr3 */
|
||
#if defined (Xenix) && !defined (SYSNDIR)
|
||
#define SYSNDIR
|
||
#endif /* Xenix */
|
||
|
||
#if defined (POSIX) || defined (DIRENT) || defined (__GNU_LIBRARY__)
|
||
#include <dirent.h>
|
||
#ifndef __GNU_LIBRARY__
|
||
#define D_NAMLEN(d) strlen((d)->d_name)
|
||
#else
|
||
#define HAVE_D_NAMLEN
|
||
#define D_NAMLEN(d) ((d)->d_namlen)
|
||
#endif
|
||
#else /* not POSIX or DIRENT */
|
||
#define dirent direct
|
||
#define D_NAMLEN(d) ((d)->d_namlen)
|
||
#define HAVE_D_NAMLEN
|
||
#if defined (USG) && !defined (sgi)
|
||
#if defined (SYSNDIR)
|
||
#include <sys/ndir.h>
|
||
#else /* Not SYSNDIR */
|
||
#include "ndir.h"
|
||
#endif /* SYSNDIR */
|
||
#else /* not USG */
|
||
#include <sys/dir.h>
|
||
#endif /* USG */
|
||
#endif /* POSIX or DIRENT or __GNU_LIBRARY__ */
|
||
|
||
#if defined (HAVE_UNISTD_H) || defined (__GNU_LIBRARY__)
|
||
#include <unistd.h>
|
||
#endif
|
||
|
||
#if (defined (STDC_HEADERS) || defined (__GNU_LIBRARY__) \
|
||
|| defined (POSIX))
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#define ANSI_STRING
|
||
#else /* No standard headers. */
|
||
|
||
#ifdef USG
|
||
|
||
#include <string.h>
|
||
#ifdef NEED_MEMORY_H
|
||
#include <memory.h>
|
||
#endif
|
||
#define ANSI_STRING
|
||
|
||
#else /* Not USG. */
|
||
|
||
#ifdef NeXT
|
||
|
||
#include <string.h>
|
||
|
||
#else /* Not NeXT. */
|
||
|
||
#include <strings.h>
|
||
|
||
#ifndef bcmp
|
||
extern int bcmp ();
|
||
#endif
|
||
#ifndef bzero
|
||
extern void bzero ();
|
||
#endif
|
||
#ifndef bcopy
|
||
extern void bcopy ();
|
||
#endif
|
||
|
||
#endif /* NeXT. */
|
||
|
||
#endif /* USG. */
|
||
|
||
extern char *malloc (), *realloc ();
|
||
extern void free ();
|
||
|
||
#endif /* Standard headers. */
|
||
|
||
#ifndef ANSI_STRING
|
||
#define memcpy(d, s, n) bcopy((s), (d), (n))
|
||
#define memmove memcpy
|
||
#endif /* Not ANSI_STRING. */
|
||
|
||
#if !defined(__alloca) && !defined(__GNU_LIBRARY__)
|
||
|
||
#ifdef __GNUC__
|
||
#undef alloca
|
||
#define alloca(n) __builtin_alloca (n)
|
||
#else /* Not GCC. */
|
||
#if defined (sparc) || defined (HAVE_ALLOCA_H)
|
||
#include <alloca.h>
|
||
#else /* Not sparc or HAVE_ALLOCA_H. */
|
||
#ifndef _AIX
|
||
extern char *alloca ();
|
||
#endif /* Not _AIX. */
|
||
#endif /* sparc or HAVE_ALLOCA_H. */
|
||
#endif /* GCC. */
|
||
|
||
#define __alloca alloca
|
||
|
||
#endif
|
||
|
||
#if (defined (HAVE_LIMITS_H) || defined (STDC_HEADERS) || \
|
||
defined (__GNU_LIBRARY__))
|
||
#include <limits.h>
|
||
#else
|
||
#include <sys/param.h>
|
||
#endif
|
||
|
||
#ifndef PATH_MAX
|
||
#ifdef MAXPATHLEN
|
||
#define PATH_MAX MAXPATHLEN
|
||
#else
|
||
#define PATH_MAX 1024
|
||
#endif
|
||
#endif
|
||
|
||
#if !defined (STDC_HEADERS) && !defined (__GNU_LIBRARY__)
|
||
#undef size_t
|
||
#define size_t unsigned int
|
||
#endif
|
||
|
||
#if !__STDC__ && !defined (const)
|
||
#define const
|
||
#endif
|
||
|
||
#ifndef __GNU_LIBRARY__
|
||
#define __lstat stat
|
||
#endif
|
||
|
||
#ifndef _LIBC
|
||
#define __getcwd getcwd
|
||
#endif
|
||
|
||
/* Get the pathname of the current working directory, and put it in SIZE
|
||
bytes of BUF. Returns NULL if the directory couldn't be determined or
|
||
SIZE was too small. If successful, returns BUF. In GNU, if BUF is
|
||
NULL, an array is allocated with `malloc'; the array is SIZE bytes long,
|
||
unless SIZE <= 0, in which case it is as big as necessary. */
|
||
|
||
char *
|
||
__getcwd (buf, size)
|
||
char *buf;
|
||
size_t size;
|
||
{
|
||
static const char dots[]
|
||
= "../../../../../../../../../../../../../../../../../../../../../../../\
|
||
../../../../../../../../../../../../../../../../../../../../../../../../../../\
|
||
../../../../../../../../../../../../../../../../../../../../../../../../../..";
|
||
const char *dotp, *dotlist;
|
||
size_t dotsize;
|
||
dev_t rootdev, thisdev;
|
||
ino_t rootino, thisino;
|
||
char *path;
|
||
register char *pathp;
|
||
struct stat st;
|
||
|
||
if (size == 0)
|
||
{
|
||
if (buf != NULL)
|
||
{
|
||
__set_errno (EINVAL);
|
||
return NULL;
|
||
}
|
||
|
||
size = PATH_MAX + 1;
|
||
}
|
||
|
||
if (buf != NULL)
|
||
path = buf;
|
||
else
|
||
{
|
||
path = malloc (size);
|
||
if (path == NULL)
|
||
return NULL;
|
||
}
|
||
|
||
pathp = path + size;
|
||
*--pathp = '\0';
|
||
|
||
if (__lstat (".", &st) < 0)
|
||
return NULL;
|
||
thisdev = st.st_dev;
|
||
thisino = st.st_ino;
|
||
|
||
if (__lstat ("/", &st) < 0)
|
||
return NULL;
|
||
rootdev = st.st_dev;
|
||
rootino = st.st_ino;
|
||
|
||
dotsize = sizeof (dots) - 1;
|
||
dotp = &dots[sizeof (dots)];
|
||
dotlist = dots;
|
||
while (!(thisdev == rootdev && thisino == rootino))
|
||
{
|
||
register DIR *dirstream;
|
||
struct dirent *d;
|
||
dev_t dotdev;
|
||
ino_t dotino;
|
||
char mount_point;
|
||
|
||
/* Look at the parent directory. */
|
||
if (dotp == dotlist)
|
||
{
|
||
/* My, what a deep directory tree you have, Grandma. */
|
||
char *new;
|
||
if (dotlist == dots)
|
||
{
|
||
new = malloc (dotsize * 2 + 1);
|
||
if (new == NULL)
|
||
return NULL;
|
||
memcpy (new, dots, dotsize);
|
||
}
|
||
else
|
||
{
|
||
new = realloc ((__ptr_t) dotlist, dotsize * 2 + 1);
|
||
if (new == NULL)
|
||
goto lose;
|
||
}
|
||
memcpy (&new[dotsize], new, dotsize);
|
||
dotp = &new[dotsize];
|
||
dotsize *= 2;
|
||
new[dotsize] = '\0';
|
||
dotlist = new;
|
||
}
|
||
|
||
dotp -= 3;
|
||
|
||
/* Figure out if this directory is a mount point. */
|
||
if (__lstat (dotp, &st) < 0)
|
||
goto lose;
|
||
dotdev = st.st_dev;
|
||
dotino = st.st_ino;
|
||
mount_point = dotdev != thisdev;
|
||
|
||
/* Search for the last directory. */
|
||
dirstream = __opendir (dotp);
|
||
if (dirstream == NULL)
|
||
goto lose;
|
||
while ((d = __readdir (dirstream)) != NULL)
|
||
{
|
||
if (d->d_name[0] == '.' &&
|
||
(d->d_name[1] == '\0' ||
|
||
(d->d_name[1] == '.' && d->d_name[2] == '\0')))
|
||
continue;
|
||
if (mount_point || (ino_t) d->d_ino == thisino)
|
||
{
|
||
char name[dotlist + dotsize - dotp + 1 + _D_ALLOC_NAMLEN (d)];
|
||
memcpy (name, dotp, dotlist + dotsize - dotp);
|
||
name[dotlist + dotsize - dotp] = '/';
|
||
strcpy (&name[dotlist + dotsize - dotp + 1], d->d_name);
|
||
if (__lstat (name, &st) < 0)
|
||
{
|
||
int save = errno;
|
||
(void) __closedir (dirstream);
|
||
__set_errno (save);
|
||
goto lose;
|
||
}
|
||
if (st.st_dev == thisdev && st.st_ino == thisino)
|
||
break;
|
||
}
|
||
}
|
||
if (d == NULL)
|
||
{
|
||
int save = errno;
|
||
(void) __closedir (dirstream);
|
||
__set_errno (save);
|
||
goto lose;
|
||
}
|
||
else
|
||
{
|
||
size_t namlen = _D_EXACT_NAMLEN (d);
|
||
|
||
if ((size_t) (pathp - path) < namlen)
|
||
{
|
||
if (buf != NULL)
|
||
{
|
||
__set_errno (ERANGE);
|
||
return NULL;
|
||
}
|
||
else
|
||
{
|
||
size *= 2;
|
||
buf = realloc (path, size);
|
||
if (buf == NULL)
|
||
{
|
||
(void) __closedir (dirstream);
|
||
free (path);
|
||
__set_errno (ENOMEM);/* closedir might have changed it.*/
|
||
return NULL;
|
||
}
|
||
pathp = &buf[pathp - path + size / 2];
|
||
path = buf;
|
||
/* Move current contents up to the end of the buffer.
|
||
This is guaranteed to be non-overlapping. */
|
||
memcpy (pathp, pathp - size / 2, path + size - pathp);
|
||
}
|
||
}
|
||
pathp -= namlen;
|
||
(void) memcpy (pathp, d->d_name, namlen);
|
||
*--pathp = '/';
|
||
(void) __closedir (dirstream);
|
||
}
|
||
|
||
thisdev = dotdev;
|
||
thisino = dotino;
|
||
}
|
||
|
||
if (pathp == &path[size - 1])
|
||
*--pathp = '/';
|
||
|
||
if (dotlist != dots)
|
||
free ((__ptr_t) dotlist);
|
||
|
||
memmove (path, pathp, path + size - pathp);
|
||
return path;
|
||
|
||
lose:
|
||
if (dotlist != dots)
|
||
free ((__ptr_t) dotlist);
|
||
return NULL;
|
||
}
|
||
|
||
#ifdef _LIBC
|
||
weak_alias (__getcwd, getcwd)
|
||
#endif
|