about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-12-14 10:00:22 +0000
committerRoland McGrath <roland@gnu.org>1995-12-14 10:00:22 +0000
commitfaf92f2a62ec5e48fac87a6ced0edfcaeb026459 (patch)
tree2dbac7248ab15af4594a41abc44e6f5a074299da
parent6a7169a5092dd967b98f5a29064f8feaae21906a (diff)
downloadglibc-cvs/libc-951214.tar.gz
glibc-cvs/libc-951214.tar.xz
glibc-cvs/libc-951214.zip
Thu Dec 14 02:28:22 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> cvs/libc-951214
	* posix/glob.c (glob_in_dir): Cast result of opendir to __ptr_t,
	and cast STREAM to DIR * before passing to readdir and closedir.

Wed Dec 13 22:06:07 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* hurd/hurdsig.c (_hurd_internal_post_signal: suspend): Reply
	after aborting RPCs but before calling proc_mark_stop.
-rw-r--r--ChangeLog10
-rw-r--r--posix/glob.c8
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ceb34e1823..35559b725c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
+Wed Dec 13 22:06:07 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* hurd/hurdsig.c (_hurd_internal_post_signal: suspend): Reply
+	after aborting RPCs but before calling proc_mark_stop.
+
 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/posix/glob.c b/posix/glob.c
index e212576d23..954960cb18 100644
--- a/posix/glob.c
+++ b/posix/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)