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.6
retrieving revision 1.9
diff -u -p -r1.6 -r1.9
--- src/lib/libc/gen/glob.c	1997/07/13 19:15:11	1.6
+++ src/lib/libc/gen/glob.c	1997/10/22 00:55:26	1.9
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.c,v 1.6 1997/07/13 19:15:11 christos Exp $	*/
+/*	$NetBSD: glob.c,v 1.9 1997/10/22 00:55:26 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-__RCSID("$NetBSD: glob.c,v 1.6 1997/07/13 19:15:11 christos Exp $");
+__RCSID("$NetBSD: glob.c,v 1.9 1997/10/22 00:55:26 fvdl Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -69,10 +69,11 @@ __RCSID("$NetBSD: glob.c,v 1.6 1997/07/1
  * gl_matchc:
  *	Number of matches in the current invocation of glob.
  */
+#define __LIBC12_SOURCE__
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
-
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -83,6 +84,11 @@ __RCSID("$NetBSD: glob.c,v 1.6 1997/07/1
 #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'
@@ -135,13 +141,13 @@ typedef char Char;
 
 static int	 compare __P((const void *, const void *));
 static void	 g_Ctoc __P((const Char *, char *));
-static int	 g_lstat __P((Char *, struct stat *, glob_t *));
+static int	 g_lstat __P((Char *, struct stat12 *, glob_t *));
 static DIR	*g_opendir __P((Char *, glob_t *));
 static Char	*g_strchr __P((Char *, int));
 #ifdef notdef
 static Char	*g_strcat __P((Char *, const Char *));
 #endif
-static int	 g_stat __P((Char *, struct stat *, glob_t *));
+static int	 g_stat __P((Char *, struct stat12 *, glob_t *));
 static int	 glob0 __P((const Char *, glob_t *));
 static int	 glob1 __P((Char *, glob_t *));
 static int	 glob2 __P((Char *, Char *, Char *, glob_t *));
@@ -513,7 +519,7 @@ glob2(pathbuf, pathend, pattern, pglob)
 	Char *pathbuf, *pathend, *pattern;
 	glob_t *pglob;
 {
-	struct stat sb;
+	struct stat12 sb;
 	Char *p, *q;
 	int anymeta;
 
@@ -765,7 +771,7 @@ g_opendir(str, pglob)
 static int
 g_lstat(fn, sb, pglob)
 	register Char *fn;
-	struct stat *sb;
+	struct stat12 *sb;
 	glob_t *pglob;
 {
 	char buf[MAXPATHLEN];
@@ -779,7 +785,7 @@ g_lstat(fn, sb, pglob)
 static int
 g_stat(fn, sb, pglob)
 	register Char *fn;
-	struct stat *sb;
+	struct stat12 *sb;
 	glob_t *pglob;
 {
 	char buf[MAXPATHLEN];