diff options
Diffstat (limited to 'dirent')
| -rw-r--r-- | dirent/Makefile | 2 | ||||
| -rw-r--r-- | dirent/dirent.h | 7 | ||||
| -rw-r--r-- | dirent/readdir_r.c | 37 |
3 files changed, 45 insertions, 1 deletions
diff --git a/dirent/Makefile b/dirent/Makefile index b6a42190eb..8d706dfe64 100644 --- a/dirent/Makefile +++ b/dirent/Makefile @@ -22,7 +22,7 @@ subdir := dirent headers := dirent.h direntry.h -routines := opendir closedir readdir rewinddir \ +routines := opendir closedir readdir readdir_r rewinddir \ seekdir telldir scandir alphasort \ getdents dirfd distribute := dirstream.h diff --git a/dirent/dirent.h b/dirent/dirent.h index 02a5e6a18a..06e92cb6b9 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h @@ -116,6 +116,13 @@ extern int closedir __P ((DIR * __dirp)); extern struct dirent *__readdir __P ((DIR * __dirp)); extern struct dirent *readdir __P ((DIR * __dirp)); +#ifdef __USE_REENTRANT +/* Reentrant versio of `readdir'. Return in RESULT a pointer to the + next entry. */ +extern int readdir_r __P ((DIR *__dirp, struct dirent *entry, + struct dirent **result)); +#endif + /* Rewind DIRP to the beginning of the directory. */ extern void rewinddir __P ((DIR * __dirp)); diff --git a/dirent/readdir_r.c b/dirent/readdir_r.c new file mode 100644 index 0000000000..b9979660fa --- /dev/null +++ b/dirent/readdir_r.c @@ -0,0 +1,37 @@ +/* readdir_r - Reentrant version of readdir. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. + +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 <dirent.h> + +/* Some systems have reentrancy problems with their `readdir' + implementation so they have an additional `readdir_r' version. The + GNU version does not have these problems but for compatibility + reasons we provide this function. It is simply a wrapper around + the normal function. + + The actual definition of this functions varies very strong from + system to system. We chose to follow the POSIX version. */ +int +readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result) +{ + *result = readdir (dirp); + + return *result != NULL ? 0 : -1; +} |