diff options
Diffstat (limited to 'openbsd-compat/glob.c')
-rw-r--r-- | openbsd-compat/glob.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index e928a2272..50f35c304 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -13,11 +13,7 @@ | |||
13 | * 2. Redistributions in binary form must reproduce the above copyright | 13 | * 2. Redistributions in binary form must reproduce the above copyright |
14 | * notice, this list of conditions and the following disclaimer in the | 14 | * notice, this list of conditions and the following disclaimer in the |
15 | * documentation and/or other materials provided with the distribution. | 15 | * documentation and/or other materials provided with the distribution. |
16 | * 3. All advertising materials mentioning features or use of this software | 16 | * 3. Neither the name of the University nor the names of its contributors |
17 | * must display the following acknowledgement: | ||
18 | * This product includes software developed by the University of | ||
19 | * California, Berkeley and its contributors. | ||
20 | * 4. Neither the name of the University nor the names of its contributors | ||
21 | * may be used to endorse or promote products derived from this software | 17 | * may be used to endorse or promote products derived from this software |
22 | * without specific prior written permission. | 18 | * without specific prior written permission. |
23 | * | 19 | * |
@@ -56,7 +52,7 @@ get_arg_max(void) | |||
56 | #if 0 | 52 | #if 0 |
57 | static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; | 53 | static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; |
58 | #else | 54 | #else |
59 | static char rcsid[] = "$OpenBSD: glob.c,v 1.20 2002/06/14 21:34:58 todd Exp $"; | 55 | static char rcsid[] = "$OpenBSD: glob.c,v 1.22 2003/06/25 21:16:47 deraadt Exp $"; |
60 | #endif | 56 | #endif |
61 | #endif /* LIBC_SCCS and not lint */ | 57 | #endif /* LIBC_SCCS and not lint */ |
62 | 58 | ||
@@ -615,7 +611,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, | |||
615 | * and dirent.h as taking pointers to differently typed opaque | 611 | * and dirent.h as taking pointers to differently typed opaque |
616 | * structures. | 612 | * structures. |
617 | */ | 613 | */ |
618 | struct dirent *(*readdirfunc)(); | 614 | struct dirent *(*readdirfunc)(void *); |
619 | 615 | ||
620 | if (pathend > pathend_last) | 616 | if (pathend > pathend_last) |
621 | return (1); | 617 | return (1); |
@@ -640,7 +636,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, | |||
640 | if (pglob->gl_flags & GLOB_ALTDIRFUNC) | 636 | if (pglob->gl_flags & GLOB_ALTDIRFUNC) |
641 | readdirfunc = pglob->gl_readdir; | 637 | readdirfunc = pglob->gl_readdir; |
642 | else | 638 | else |
643 | readdirfunc = readdir; | 639 | readdirfunc = (struct dirent *(*)(void *))readdir; |
644 | while ((dp = (*readdirfunc)(dirp))) { | 640 | while ((dp = (*readdirfunc)(dirp))) { |
645 | register u_char *sc; | 641 | register u_char *sc; |
646 | register Char *dc; | 642 | register Char *dc; |