diff options
Diffstat (limited to 'dirent')
| -rw-r--r-- | dirent/dirent.h | 2 | ||||
| -rw-r--r-- | dirent/scandir.c | 30 |
2 files changed, 17 insertions, 15 deletions
diff --git a/dirent/dirent.h b/dirent/dirent.h index 22ddcbbf6d..c357be2bcf 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h @@ -119,6 +119,8 @@ 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)); extern int readdir_r __P ((DIR *__dirp, struct dirent *entry, struct dirent **result)); #endif diff --git a/dirent/scandir.c b/dirent/scandir.c index cffe5056ac..b1fc55fbb2 100644 --- a/dirent/scandir.c +++ b/dirent/scandir.c @@ -1,20 +1,20 @@ /* Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. + 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 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. + 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. */ + 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> #include <stdlib.h> @@ -31,7 +31,7 @@ scandir (dir, namelist, select, cmp) DIR *dp = opendir (dir); struct dirent **v = NULL; size_t vsize = 0, i; - struct dirent *d; + struct dirent dirbuf, *d; int save; if (dp == NULL) @@ -41,7 +41,7 @@ scandir (dir, namelist, select, cmp) __set_errno (0); i = 0; - while ((d = readdir (dp)) != NULL) + while (__readdir_r (dp, &dirbuf, &d) >= 0) if (select == NULL || (*select) (d)) { size_t dsize; |