mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
92777700d2
* sysdeps/unix/dirstream.h: Rewritten. * sysdeps/unix/readdir.c: Rewritten. * sysdeps/unix/telldir.c: Rewritten. * sysdeps/unix/closedir.c: Use <...> instead of "..." for dirstream.h. Remove __ from DIR struct member names. * sysdeps/unix/dirfd.c: Likewise. * sysdeps/unix/seekdir.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/opendir.c: Likewise. Don't allocate extra space after DIR structure. * sysdeps/stub/direct.h: File removed. * sysdeps/unix/bsd/bsd4.4/direct.h: File removed. * sysdeps/unix/bsd/direct.h: File removed. * sysdeps/unix/common/direct.h: File removed. * sysdeps/unix/sysv/irix4/direct.h: File removed. * sysdeps/unix/sysv/isc3/direct.h: File removed. * sysdeps/unix/sysv/sco3.2.4/direct.h: File removed. * sysdeps/unix/sysv/sysv4/solaris2/direct.h: File removed. * sysdeps/unix/common/direntry.h: New file. * sysdeps/unix/bsd/direntry.h: New file. * sysdeps/unix/bsd/bsd4.4/direntry.h: New file. * sysdeps/unix/sysv/direntry.h: New file. * sysdeps/stub/direntry.h: New file. * dirent/dirent.h (struct dirent): Type removed. Include <direntry.h> to define it. (_D_EXACT_NAMLEN, _D_ALLOC_NAMLEN): New macros. * dirent/Makefile (headers): Add direntry.h. (distribute): Remove direct.h. * sysdeps/posix/getcwd.c: Use new macros instead of d_namlen. * dirent/scandir.c: Likewise. * io/fts.c (fts_build): Likewise. * io/ftw.c (ftw_dir): Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/syscalls.list: New file. * sysdeps/mach/hurd/profil.c (MAX_PC_SAMPLES): New macro. (collector_timeout): New static variable. (update_waiter): Actually call __task_enable_pc_sampling. Set collector_timeout based on the `tick' count returned. (profile_waiter): Use MAX_PC_SAMPLES. Set nsamples before RPC. Use collector_timeout in __mach_msg call. * gmon/Makefile (noprof): New variable containing mcount. Append profil unless it is in $(unix-syscalls). (mcount.po): Use $(noprof) for list of targets in this rule. * libc-symbols.h: Define _LIBC before #include <config.h>. Sun Feb 25 12:29:23 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * config.h.in [_LIBC] (HAVE_STRERROR): Define it. Protect 2nd page of #undef's for generator programs with #ifndef _LIBC. * time/zic.c, time/zdump.c, time/private.h: Updated from ADO's latest. Fri Feb 9 12:40:19 1996 Brendan Kehoe <brendan@lisa.cygnus.com> * libio/cleanup.c (_IO_cleanup_registration_needed) [!_G_HAVE_ATEXIT]: Init to NULL. * libio/filedoalloc.c (_IO_cleanup_registration_needed): Remove decl. Thu Feb 8 08:12:50 1996 Brendan Kehoe <brendan@cygnus.com> * libio/filedoalloc.c (_IO_cleanup_registration_needed): Revert previous change, since cleanup.c only defines it if _G_HAVE_ATEXIT. Wed Feb 7 15:10:17 1996 Brendan Kehoe <brendan@lisa.cygnus.com> * libio/filedoalloc.c (_IO_cleanup_registration_needed): Declare as extern. Sat Feb 24 11:34:13 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * sysdeps/i386/memcmp.S: Fix argument %esp offsets. * time/sys/time.h (timeradd, timersub): New macros; BSD has these.
220 lines
4.3 KiB
C
220 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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <ansidecl.h>
|
|
#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
|
|
DEFUN (ftw_dir, (dirs, level, descriptors, dir, len, func),
|
|
DIR **dirs AND int level AND int descriptors AND
|
|
char *dir AND size_t len AND
|
|
int EXFUN((*func), (CONST char *file, struct stat *status,
|
|
int flag)))
|
|
{
|
|
int got;
|
|
struct dirent *entry;
|
|
|
|
got = 0;
|
|
|
|
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')))
|
|
{
|
|
errno = 0;
|
|
continue;
|
|
}
|
|
|
|
namlen = _D_EXACT_NAMLEN (entry);
|
|
|
|
if (namlen + len + 1 > PATH_MAX)
|
|
{
|
|
#ifdef ENAMETOOLONG
|
|
errno = ENAMETOOLONG;
|
|
#else
|
|
errno = ENOMEM;
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
dir[len] = '/';
|
|
memcpy ((PTR) (dir + len + 1), (PTR) 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]);
|
|
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)
|
|
{
|
|
errno = 0;
|
|
if (readdir (dirs[level]) == NULL)
|
|
return errno == 0 ? 0 : -1;
|
|
}
|
|
}
|
|
|
|
errno = 0;
|
|
}
|
|
|
|
return errno == 0 ? 0 : -1;
|
|
}
|
|
|
|
/* Call a function on every element in a directory tree. */
|
|
|
|
int
|
|
DEFUN(ftw, (dir, func, descriptors),
|
|
CONST char *dir AND
|
|
int EXFUN((*func), (CONST char *file, struct stat *status,
|
|
int flag)) AND
|
|
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 ((PTR) buf, (PTR) 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]);
|
|
errno = save;
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|