mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +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.
214 lines
4.3 KiB
C
214 lines
4.3 KiB
C
/* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ian Lance Taylor (ian@airs.com).
|
|
|
|
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 <errno.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <dirent.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <ftw.h>
|
|
|
|
|
|
#ifndef PATH_MAX
|
|
#define PATH_MAX 1024 /* XXX */
|
|
#endif
|
|
|
|
|
|
/* Traverse one level of a directory tree. */
|
|
|
|
static int
|
|
ftw_dir (DIR **dirs, int level, int descriptors, char *dir, size_t len,
|
|
int (*func) (const char *file, struct stat *status, int flag))
|
|
{
|
|
int got;
|
|
struct dirent *entry;
|
|
|
|
got = 0;
|
|
|
|
__set_errno (0);
|
|
|
|
while ((entry = readdir (dirs[level])) != NULL)
|
|
{
|
|
struct stat s;
|
|
int flag, retval, newlev;
|
|
size_t namlen;
|
|
|
|
++got;
|
|
|
|
if (entry->d_name[0] == '.'
|
|
&& (entry->d_name[1] == '\0' ||
|
|
(entry->d_name[1] == '.' && entry->d_name[2] == '\0')))
|
|
{
|
|
__set_errno (0);
|
|
continue;
|
|
}
|
|
|
|
namlen = _D_EXACT_NAMLEN (entry);
|
|
|
|
if (namlen + len + 1 > PATH_MAX)
|
|
{
|
|
#ifdef ENAMETOOLONG
|
|
__set_errno (ENAMETOOLONG);
|
|
#else
|
|
__set_errno (ENOMEM);
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
dir[len] = '/';
|
|
memcpy ((void *) (dir + len + 1), (void *) entry->d_name,
|
|
namlen + 1);
|
|
|
|
if (stat (dir, &s) < 0)
|
|
{
|
|
if (errno != EACCES && errno != ENOENT)
|
|
return -1;
|
|
flag = FTW_NS;
|
|
}
|
|
else if (S_ISDIR (s.st_mode))
|
|
{
|
|
newlev = (level + 1) % descriptors;
|
|
|
|
if (dirs[newlev] != NULL)
|
|
closedir (dirs[newlev]);
|
|
|
|
dirs[newlev] = opendir (dir);
|
|
if (dirs[newlev] != NULL)
|
|
flag = FTW_D;
|
|
else
|
|
{
|
|
if (errno != EACCES)
|
|
return -1;
|
|
flag = FTW_DNR;
|
|
}
|
|
}
|
|
else
|
|
flag = FTW_F;
|
|
|
|
retval = (*func) (dir, &s, flag);
|
|
|
|
if (flag == FTW_D)
|
|
{
|
|
if (retval == 0)
|
|
retval = ftw_dir (dirs, newlev, descriptors, dir,
|
|
namlen + len + 1, func);
|
|
if (dirs[newlev] != NULL)
|
|
{
|
|
int save;
|
|
|
|
save = errno;
|
|
closedir (dirs[newlev]);
|
|
__set_errno (save);
|
|
dirs[newlev] = NULL;
|
|
}
|
|
}
|
|
|
|
if (retval != 0)
|
|
return retval;
|
|
|
|
if (dirs[level] == NULL)
|
|
{
|
|
int skip;
|
|
|
|
dir[len] = '\0';
|
|
dirs[level] = opendir (dir);
|
|
if (dirs[level] == NULL)
|
|
return -1;
|
|
skip = got;
|
|
while (skip-- != 0)
|
|
{
|
|
__set_errno (0);
|
|
if (readdir (dirs[level]) == NULL)
|
|
return errno == 0 ? 0 : -1;
|
|
}
|
|
}
|
|
|
|
__set_errno (0);
|
|
}
|
|
|
|
return errno == 0 ? 0 : -1;
|
|
}
|
|
|
|
/* Call a function on every element in a directory tree. */
|
|
|
|
int
|
|
ftw (const char *dir,
|
|
int (*func) (const char *file, struct stat *status, int flag),
|
|
int descriptors)
|
|
{
|
|
DIR **dirs;
|
|
size_t len;
|
|
char buf[PATH_MAX + 1];
|
|
struct stat s;
|
|
int flag, retval;
|
|
int i;
|
|
|
|
if (descriptors <= 0)
|
|
descriptors = 1;
|
|
|
|
dirs = (DIR **) __alloca (descriptors * sizeof (DIR *));
|
|
i = descriptors;
|
|
while (i-- > 0)
|
|
dirs[i] = NULL;
|
|
|
|
if (stat (dir, &s) < 0)
|
|
{
|
|
if (errno != EACCES && errno != ENOENT)
|
|
return -1;
|
|
flag = FTW_NS;
|
|
}
|
|
else if (S_ISDIR (s.st_mode))
|
|
{
|
|
dirs[0] = opendir (dir);
|
|
if (dirs[0] != NULL)
|
|
flag = FTW_D;
|
|
else
|
|
{
|
|
if (errno != EACCES)
|
|
return -1;
|
|
flag = FTW_DNR;
|
|
}
|
|
}
|
|
else
|
|
flag = FTW_F;
|
|
|
|
len = strlen (dir);
|
|
memcpy ((void *) buf, (void *) dir, len + 1);
|
|
|
|
retval = (*func) (buf, &s, flag);
|
|
|
|
if (flag == FTW_D)
|
|
{
|
|
if (retval == 0)
|
|
retval = ftw_dir (dirs, 0, descriptors, buf, len, func);
|
|
if (dirs[0] != NULL)
|
|
{
|
|
int save;
|
|
|
|
save = errno;
|
|
closedir (dirs[0]);
|
|
__set_errno (save);
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|