Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/glob.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/gen/glob.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- src/lib/libc/gen/glob.c	1993/11/06 01:10:18	1.4
+++ src/lib/libc/gen/glob.c	1997/07/21 14:07:17	1.7
@@ -1,3 +1,5 @@
+/*	$NetBSD: glob.c,v 1.7 1997/07/21 14:07:17 jtc Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,9 +36,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93"; */
-static char *rcsid = "$Id: glob.c,v 1.4 1993/11/06 01:10:18 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
+#else
+__RCSID("$NetBSD: glob.c,v 1.7 1997/07/21 14:07:17 jtc Exp $");
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -64,6 +70,7 @@ static char *rcsid = "$Id: glob.c,v 1.4 
  *	Number of matches in the current invocation of glob.
  */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
@@ -77,6 +84,11 @@ static char *rcsid = "$Id: glob.c,v 1.4 
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __weak_alias
+__weak_alias(glob,_glob);
+__weak_alias(globfree,_globfree);
+#endif
+
 #define	DOLLAR		'$'
 #define	DOT		'.'
 #define	EOS		'\0'
@@ -569,7 +581,7 @@ glob3(pathbuf, pathend, pattern, restpat
 	 * and dirent.h as taking pointers to differently typed opaque
 	 * structures.
 	 */
-	struct dirent *(*readdirfunc)();
+	struct dirent *(*readdirfunc) __P((void *));
 
 	*pathend = EOS;
 	errno = 0;
@@ -591,7 +603,7 @@ glob3(pathbuf, pathend, pattern, restpat
 	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
 		readdirfunc = pglob->gl_readdir;
 	else
-		readdirfunc = readdir;
+		readdirfunc = (struct dirent *(*)__P((void *))) readdir;
 	while ((dp = (*readdirfunc)(dirp))) {
 		register u_char *sc;
 		register Char *dc;