diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2002-06-06 00:58:59 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2002-06-06 00:58:59 +0400 |
| commit | 39e65e0113e188e4177077407d337bb3a1ac1853 (patch) | |
| tree | 7afb2759a870354f5267c72215acfcfc89bb12fa /newlib/libc/posix/closedir.c | |
| parent | ea4e6ec8f9fe4a784d4ce2ef71037e05fb9a876d (diff) | |
2002-06-05 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/string.h[__linux__]: Add strsignal prototype.
* libc/include/sys/lock.h: New file with default locking support.
* libc/include/sys/reent.h: Add signal buffer support for strsignal
and psignal.
* libc/posix/Makefile.am: Add support for readdir_r.c.
* libc/posix/Makefile.in: Regenerated.
* libc/posix/closedir.c: Add locking support and hash table cleanup.
* libc/posix/opendir.c: Add lock support.
* libc/posix/readdir.c: Ditto.
* libc/posix/rewinddir.c: Ditto.
* libc/posix/scandir.c: Ditto.
* libc/posix/seekdir.c: Ditto.
* libc/posix/telldir.c: Ditto plus add _cleanupdir routine to
clean up leftover hash table entries.
* libc/posix/readdir_r.c: New file.
* libc/sys/linux/Makefile.am: Add psignal.c and strsignal.c support.
* libc/sys/linux/Makefile.in: Regenerated.
* libc/sys/linux/sys/dirent.h: Add dd_lock to DIR structure.
* libc/sys/linux/sys/signal.h: Add psignal prototype.
* libc/sys/linux/psignal.c: New file.
* libc/sys/linux/strsignal.c: Ditto.
Diffstat (limited to 'newlib/libc/posix/closedir.c')
| -rw-r--r-- | newlib/libc/posix/closedir.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/newlib/libc/posix/closedir.c b/newlib/libc/posix/closedir.c index 4ad6e4c97..57222f947 100644 --- a/newlib/libc/posix/closedir.c +++ b/newlib/libc/posix/closedir.c @@ -41,6 +41,9 @@ static char sccsid[] = "@(#)closedir.c 5.9 (Berkeley) 2/23/91"; #include <dirent.h> #include <stdlib.h> #include <unistd.h> +#include <sys/lock.h> + +extern void _cleanupdir (DIR *dirp); /* * close a directory. @@ -49,14 +52,26 @@ int closedir(dirp) register DIR *dirp; { - int fd; + int fd, rc; +#ifdef HAVE_DD_LOCK + __lock_acquire_recursive(dirp->dd_lock); +#endif + rc = 0; fd = dirp->dd_fd; - dirp->dd_fd = -1; - dirp->dd_loc = 0; - (void)free((void *)dirp->dd_buf); - (void)free((void *)dirp); - return(close(fd)); + if (fd != -1) { + dirp->dd_fd = -1; + dirp->dd_loc = 0; + (void)free((void *)dirp->dd_buf); + (void)free((void *)dirp); + rc = close(fd); + _cleanupdir(dirp); + } +#ifdef HAVE_DD_LOCK + __lock_release_recursive(dirp->dd_lock); + __lock_close_recursive(dirp->dd_lock); +#endif + return rc; } #endif /* ! HAVE_OPENDIR */ |