Updated from libc

diff --git a/glob/ChangeLog b/glob/ChangeLog
index ac27755ce6cd2c07e3f3b636eeb050efb8eae5d0..1dd02efc0346b376a4d1ffe7429bf178b50d9ce9 100644 (file)
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 14 02:28:22 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+       * posix/glob.c (glob_in_dir): Cast result of opendir to __ptr_t,
+       and cast STREAM to DIR * before passing to readdir and closedir.
+
 Mon Dec 11 20:07:54 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
        * posix/glob.c [! STDC_HEADERS]: Declare getenv.

diff --git a/glob/glob.c b/glob/glob.c
index e212576d231862b8ff0528bd6eb31d8adf9fc8b3..954960cb182b65d2784b20ad0d81047a7c0ca84c 100644 (file)
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -668,7 +668,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 
       stream = ((flags & GLOB_ALTDIRFUNC) ?
                (*pglob->gl_opendir) (directory) :
-               opendir (directory));
+               (__ptr_t) opendir (directory));
       if (stream == NULL)
        {
          if ((errfunc != NULL && (*errfunc) (directory, errno)) ||
@@ -682,7 +682,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
            size_t len;
            struct dirent *d = ((flags & GLOB_ALTDIRFUNC) ?
                                (*pglob->gl_readdir) (stream) :
-                               readdir (stream));
+                               readdir ((DIR *) stream));
            if (d == NULL)
              break;
            if (! REAL_DIR_ENTRY (d))
@@ -757,7 +757,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
       if (flags & GLOB_ALTDIRFUNC)
        (*pglob->gl_closedir) (stream);
       else
-       closedir (stream);
+       closedir ((DIR *) stream);
       errno = save;
     }
   return nfound == 0 ? GLOB_NOMATCH : 0;
@@ -768,7 +768,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
     if (flags & GLOB_ALTDIRFUNC)
       (*pglob->gl_closedir) (stream);
     else
-      closedir (stream);
+      closedir ((DIR *) stream);
     errno = save;
   }
   while (names != NULL)