summaryrefslogtreecommitdiff
path: root/openbsd-compat/glob.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2003-08-25 01:10:51 +0000
committerBen Lindstrom <mouring@eviladmin.org>2003-08-25 01:10:51 +0000
commitaf4a6c3a5619299a16cfbb545cde110849596204 (patch)
tree4145a5d683ef920d9c1068c09d028e1ce5a73d96 /openbsd-compat/glob.c
parent331b6af8fa96417cf126383de7e2ed024b7c7e2c (diff)
- (bal) openbsd-compat/ OpenBSD updates. Mostly licensing, ansifications
and minor fixes.
Diffstat (limited to 'openbsd-compat/glob.c')
-rw-r--r--openbsd-compat/glob.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 2ba56e003..50f35c304 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -52,7 +52,7 @@ get_arg_max(void)
52#if 0 52#if 0
53static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; 53static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
54#else 54#else
55static char rcsid[] = "$OpenBSD: glob.c,v 1.21 2003/06/02 20:18:34 millert Exp $"; 55static char rcsid[] = "$OpenBSD: glob.c,v 1.22 2003/06/25 21:16:47 deraadt Exp $";
56#endif 56#endif
57#endif /* LIBC_SCCS and not lint */ 57#endif /* LIBC_SCCS and not lint */
58 58
@@ -611,7 +611,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
611 * and dirent.h as taking pointers to differently typed opaque 611 * and dirent.h as taking pointers to differently typed opaque
612 * structures. 612 * structures.
613 */ 613 */
614 struct dirent *(*readdirfunc)(); 614 struct dirent *(*readdirfunc)(void *);
615 615
616 if (pathend > pathend_last) 616 if (pathend > pathend_last)
617 return (1); 617 return (1);
@@ -636,7 +636,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
636 if (pglob->gl_flags & GLOB_ALTDIRFUNC) 636 if (pglob->gl_flags & GLOB_ALTDIRFUNC)
637 readdirfunc = pglob->gl_readdir; 637 readdirfunc = pglob->gl_readdir;
638 else 638 else
639 readdirfunc = readdir; 639 readdirfunc = (struct dirent *(*)(void *))readdir;
640 while ((dp = (*readdirfunc)(dirp))) { 640 while ((dp = (*readdirfunc)(dirp))) {
641 register u_char *sc; 641 register u_char *sc;
642 register Char *dc; 642 register Char *dc;