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.

1 files changed, 28 insertions, 4 deletions

diff --git a/newlib/libc/posix/readdir.c b/newlib/libc/posix/readdir.c
index 308330cb0..4de66e4f9 100644
--- a/newlib/libc/posix/readdir.c
+++ b/newlib/libc/posix/readdir.c
@@ -39,6 +39,8 @@ static char sccsid[] = "@(#)readdir.c	5.7 (Berkeley) 6/1/90";
 
 #include <dirent.h>
 
+extern int getdents (int fd, void *dp, int count);
+
 /*
  * get next entry in a directory.
  */
@@ -46,29 +48,51 @@ struct dirent *
 readdir(dirp)
 register DIR *dirp; {
   register struct dirent *dp;
-  
+ 
+#ifdef HAVE_DD_LOCK
+  __lock_acquire_recursive(dirp->dd_lock);
+#endif
+
+  if (dirp->dd_fd == -1)
+    return NULL;
+ 
   for (;;) {
     if (dirp->dd_loc == 0) {
       dirp->dd_size = getdents (dirp->dd_fd,
 				dirp->dd_buf,
 				dirp->dd_len);
       
-      if (dirp->dd_size <= 0)
+      if (dirp->dd_size <= 0) {
+#ifdef HAVE_DD_LOCK
+        __lock_release_recursive(dirp->dd_lock);
+#endif
 	return NULL;
+      }
     }
     if (dirp->dd_loc >= dirp->dd_size) {
       dirp->dd_loc = 0;
       continue;
     }
     dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
-    if ((int)dp & 03)	/* bogus pointer check */
+    if ((int)dp & 03) {	/* bogus pointer check */
+#ifdef HAVE_DD_LOCK
+      __lock_release_recursive(dirp->dd_lock);
+#endif
       return NULL;
+    }
     if (dp->d_reclen <= 0 ||
-	dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
+	dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc) {
+#ifdef HAVE_DD_LOCK
+      __lock_release_recursive(dirp->dd_lock);
+#endif
       return NULL;
+    }
     dirp->dd_loc += dp->d_reclen;
     if (dp->d_ino == 0)
       continue;
+#ifdef HAVE_DD_LOCK
+    __lock_release_recursive(dirp->dd_lock);
+#endif
     return (dp);
   }
 }