mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2024-12-27 23:06:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated from libc

Browse source
This commit is contained in:
Roland McGrath 1995-12-14 11:14:36 +00:00
parent 4356ddddbc
commit a89eb21084
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
glob/ChangeLog
View file

@ -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> Mon Dec 11 20:07:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c [! STDC_HEADERS]: Declare getenv. * posix/glob.c [! STDC_HEADERS]: Declare getenv.

8
glob/glob.c
View file

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