---- glob.c.orig 2004-11-25 11:38:01.000000000 -0800
-+++ glob.c 2005-02-24 16:02:34.000000000 -0800
-@@ -40,6 +40,8 @@
+--- glob.c.orig 2008-03-15 10:50:43.000000000 -0700
++++ glob.c 2008-03-27 03:28:31.000000000 -0700
+@@ -40,6 +40,8 @@ static char sccsid[] = "@(#)glob.c 8.3 (
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.22 2004/07/29 03:48:52 tjr Exp $");
/*
* glob(3) -- a superset of the one defined in POSIX 1003.2.
*
-@@ -144,24 +146,24 @@
+@@ -143,25 +145,33 @@ typedef char Char;
+ #define ismeta(c) (((c)&M_QUOTE) != 0)
- static int compare(const void *, const void *);
+-static int compare(const void *, const void *);
-static int g_Ctoc(const Char *, char *, u_int);
-static int g_lstat(Char *, struct stat *, glob_t *);
-static DIR *g_opendir(Char *, glob_t *);
-+static int g_Ctoc(const Char *, char *, u_int, locale_t);
+-static Char *g_strchr(Char *, wchar_t);
++#define compare __gl_compare
++#define g_Ctoc __gl_g_Ctoc
++#define g_strchr __gl_g_strchr
++#define globextend __gl_globextend
++#define globtilde __gl_globtilde
++#define match __gl_match
++__private_extern__ int compare(const void *, const void *);
++__private_extern__ int g_Ctoc(const Char *, char *, u_int, locale_t);
++__private_extern__ Char *g_strchr(Char *, wchar_t);
++__private_extern__ int globextend(const Char *, glob_t *, int *, locale_t);
++__private_extern__ const Char *
++ globtilde(const Char *, Char *, size_t, glob_t *);
++__private_extern__ int match(Char *, Char *, Char *, locale_t);
++
++
+static int g_lstat(Char *, struct stat *, glob_t *, locale_t);
+static DIR *g_opendir(Char *, glob_t *, locale_t);
- static Char *g_strchr(Char *, wchar_t);
#ifdef notdef
static Char *g_strcat(Char *, const Char *);
#endif
-static int glob2(Char *, Char *, Char *, Char *, glob_t *, int *);
-static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, int *);
-static int globextend(const Char *, glob_t *, int *);
+-static const Char *
+- globtilde(const Char *, Char *, size_t, glob_t *);
+-static int globexp1(const Char *, glob_t *, int *);
+-static int globexp2(const Char *, const Char *, glob_t *, int *, int *);
+-static int match(Char *, Char *, Char *);
+static int g_stat(Char *, struct stat *, glob_t *, locale_t);
+static int glob0(const Char *, glob_t *, int *, locale_t);
+static int glob1(Char *, glob_t *, int *, locale_t);
+static int glob2(Char *, Char *, Char *, Char *, glob_t *, int *, locale_t);
+static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, int *, locale_t);
-+static int globextend(const Char *, glob_t *, int *, locale_t);
- static const Char *
- globtilde(const Char *, Char *, size_t, glob_t *);
--static int globexp1(const Char *, glob_t *, int *);
--static int globexp2(const Char *, const Char *, glob_t *, int *, int *);
--static int match(Char *, Char *, Char *);
+static int globexp1(const Char *, glob_t *, int *, locale_t);
+static int globexp2(const Char *, const Char *, glob_t *, int *, int *, locale_t);
-+static int match(Char *, Char *, Char *, locale_t);
#ifdef DEBUG
static void qprintf(const char *, Char *);
#endif
-@@ -178,6 +180,8 @@
+@@ -178,6 +188,8 @@ glob(pattern, flags, errfunc, pglob)
mbstate_t mbs;
wchar_t wc;
size_t clen;
patnext = (u_char *) pattern;
if (!(flags & GLOB_APPEND)) {
-@@ -200,8 +204,8 @@
+@@ -200,8 +212,8 @@ glob(pattern, flags, errfunc, pglob)
bufend = bufnext + MAXPATHLEN - 1;
if (flags & GLOB_NOESCAPE) {
memset(&mbs, 0, sizeof(mbs));
if (clen == (size_t)-1 || clen == (size_t)-2)
return (GLOB_NOMATCH);
else if (clen == 0)
-@@ -212,7 +216,7 @@
+@@ -212,7 +224,7 @@ glob(pattern, flags, errfunc, pglob)
} else {
/* Protect the quoted characters. */
memset(&mbs, 0, sizeof(mbs));
if (*patnext == QUOTE) {
if (*++patnext == EOS) {
*bufnext++ = QUOTE | M_PROTECT;
-@@ -221,7 +225,7 @@
+@@ -221,7 +233,7 @@ glob(pattern, flags, errfunc, pglob)
prot = M_PROTECT;
} else
prot = 0;
if (clen == (size_t)-1 || clen == (size_t)-2)
return (GLOB_NOMATCH);
else if (clen == 0)
-@@ -233,9 +237,9 @@
+@@ -233,9 +245,9 @@ glob(pattern, flags, errfunc, pglob)
*bufnext = EOS;
if (flags & GLOB_BRACE)
}
/*
-@@ -244,23 +248,24 @@
+@@ -244,23 +256,24 @@ glob(pattern, flags, errfunc, pglob)
* characters
*/
static int
}
-@@ -270,10 +275,11 @@
+@@ -270,10 +283,11 @@ globexp1(pattern, pglob, limit)
* If it fails then it tries to glob the rest of the pattern and returns.
*/
static int
{
int i;
Char *lm, *ls;
-@@ -310,7 +316,7 @@
+@@ -310,7 +324,7 @@ globexp2(ptr, pattern, pglob, rv, limit)
/* Non matching braces; just glob the pattern */
if (i != 0 || *pe == EOS) {
return 0;
}
-@@ -357,7 +363,7 @@
+@@ -357,7 +371,7 @@ globexp2(ptr, pattern, pglob, rv, limit)
#ifdef DEBUG
qprintf("globexp2:", patbuf);
#endif
/* move after the comma, to the next string */
pl = pm + 1;
-@@ -447,10 +453,11 @@
+@@ -373,10 +387,11 @@ globexp2(ptr, pattern, pglob, rv, limit)
+
+
+
++#ifndef BUILDING_VARIANT
+ /*
+ * expand tilde from the passwd file.
+ */
+-static const Char *
++__private_extern__ const Char *
+ globtilde(pattern, patbuf, patbuf_len, pglob)
+ const Char *pattern;
+ Char *patbuf;
+@@ -438,6 +453,7 @@ globtilde(pattern, patbuf, patbuf_len, p
+
+ return patbuf;
+ }
++#endif /* BUILDING_VARIANT */
+
+
+ /*
+@@ -447,13 +463,15 @@ globtilde(pattern, patbuf, patbuf_len, p
* if things went well, nonzero if errors occurred.
*/
static int
+ locale_t loc;
{
const Char *qpatnext;
- int c, err, oldpathc;
-@@ -512,7 +519,7 @@
+- int c, err, oldpathc;
++ Char c;
++ int err, oldpathc;
+ Char *bufnext, patbuf[MAXPATHLEN];
+
+ qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
+@@ -462,6 +480,10 @@ glob0(pattern, pglob, limit)
+
+ /* We don't need to check for buffer overflow any more. */
+ while ((c = *qpatnext++) != EOS) {
++ if (c & M_PROTECT) {
++ *bufnext++ = CHAR(c);
++ continue;
++ } /* else */
+ switch (c) {
+ case LBRACKET:
+ c = *qpatnext;
+@@ -512,7 +534,7 @@ glob0(pattern, pglob, limit)
qprintf("glob0:", patbuf);
#endif
return(err);
/*
-@@ -525,7 +532,7 @@
+@@ -525,7 +547,7 @@ glob0(pattern, pglob, limit)
if (((pglob->gl_flags & GLOB_NOCHECK) ||
((pglob->gl_flags & GLOB_NOMAGIC) &&
!(pglob->gl_flags & GLOB_MAGCHAR))))
else
return(GLOB_NOMATCH);
}
-@@ -543,10 +550,11 @@
+@@ -535,18 +557,21 @@ glob0(pattern, pglob, limit)
+ return(0);
+ }
+
+-static int
++#ifndef BUILDING_VARIANT
++__private_extern__ int
+ compare(p, q)
+ const void *p, *q;
+ {
+- return(strcmp(*(char **)p, *(char **)q));
++ return(strcoll(*(char **)p, *(char **)q));
}
++#endif /* BUILDING_VARIANT */
static int
-glob1(pattern, pglob, limit)
{
Char pathbuf[MAXPATHLEN];
-@@ -554,7 +562,7 @@
+@@ -554,7 +579,7 @@ glob1(pattern, pglob, limit)
if (*pattern == EOS)
return(0);
return(glob2(pathbuf, pathbuf, pathbuf + MAXPATHLEN - 1,
}
/*
-@@ -563,10 +571,11 @@
+@@ -563,10 +588,11 @@ glob1(pattern, pglob, limit)
* meta characters.
*/
static int
{
struct stat sb;
Char *p, *q;
-@@ -579,13 +588,13 @@
+@@ -579,13 +605,13 @@ glob2(pathbuf, pathend, pathend_last, pa
for (anymeta = 0;;) {
if (*pattern == EOS) { /* End of pattern? */
*pathend = EOS;
S_ISDIR(sb.st_mode)))) {
if (pathend + 1 > pathend_last)
return (GLOB_ABORTED);
-@@ -593,7 +602,7 @@
+@@ -593,7 +619,7 @@ glob2(pathbuf, pathend, pathend_last, pa
*pathend = EOS;
}
++pglob->gl_matchc;
}
/* Find end of next segment, copy tentatively to pathend. */
-@@ -617,16 +626,17 @@
+@@ -617,16 +643,17 @@ glob2(pathbuf, pathend, pathend_last, pa
}
} else /* Need expansion, recurse. */
return(glob3(pathbuf, pathend, pathend_last, pattern, p,
{
struct dirent *dp;
DIR *dirp;
-@@ -646,10 +656,10 @@
+@@ -646,15 +673,16 @@ glob3(pathbuf, pathend, pathend_last, pa
*pathend = EOS;
errno = 0;
- if (g_Ctoc(pathbuf, buf, sizeof(buf)))
+ if (g_Ctoc(pathbuf, buf, sizeof(buf), loc))
return (GLOB_ABORTED);
- if (pglob->gl_errfunc(buf, errno) ||
- pglob->gl_flags & GLOB_ERR)
-@@ -679,7 +689,7 @@
+- if (pglob->gl_errfunc(buf, errno) ||
+- pglob->gl_flags & GLOB_ERR)
++ if (pglob->gl_errfunc(buf, errno))
+ return (GLOB_ABORTED);
+ }
++ if (pglob->gl_flags & GLOB_ERR)
++ return (GLOB_ABORTED);
+ return(0);
+ }
+
+@@ -679,7 +707,7 @@ glob3(pathbuf, pathend, pathend_last, pa
dc = pathend;
sc = (u_char *) dp->d_name;
while (dc < pathend_last) {
if (clen == (size_t)-1 || clen == (size_t)-2) {
wc = *sc;
clen = 1;
-@@ -689,12 +699,12 @@
+@@ -689,12 +717,12 @@ glob3(pathbuf, pathend, pathend_last, pa
break;
sc += clen;
}
if (err)
break;
}
-@@ -722,10 +732,11 @@
+@@ -707,6 +735,7 @@ glob3(pathbuf, pathend, pathend_last, pa
+ }
+
+
++#ifndef BUILDING_VARIANT
+ /*
+ * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
+ * add the new item, and update gl_pathc.
+@@ -721,11 +750,12 @@ glob3(pathbuf, pathend, pathend_last, pa
+ * Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
* gl_pathv points to (gl_offs + gl_pathc + 1) items.
*/
- static int
+-static int
-globextend(path, pglob, limit)
++__private_extern__ int
+globextend(path, pglob, limit, loc)
const Char *path;
glob_t *pglob;
{
char **pathv;
int i;
-@@ -760,9 +771,9 @@
+@@ -760,9 +790,9 @@ globextend(path, pglob, limit)
for (p = path; *p++;)
continue;
free(copy);
return (GLOB_NOSPACE);
}
-@@ -777,8 +788,9 @@
+@@ -776,9 +806,10 @@ globextend(path, pglob, limit)
+ * pattern matching function for filenames. Each occurrence of the *
* pattern causes a recursion level.
*/
- static int
+-static int
-match(name, pat, patend)
++__private_extern__ int
+match(name, pat, patend, loc)
Char *name, *pat, *patend;
+ locale_t loc;
{
int ok, negate_range;
Char c, k;
-@@ -790,7 +802,7 @@
+@@ -790,7 +821,7 @@ match(name, pat, patend)
if (pat == patend)
return(1);
do
return(1);
while (*name++ != EOS);
return(0);
-@@ -806,10 +818,10 @@
+@@ -806,10 +837,10 @@ match(name, pat, patend)
++pat;
while (((c = *pat++) & M_MASK) != M_END)
if ((*pat & M_MASK) == M_RNG) {
)
ok = 1;
pat += 2;
-@@ -846,16 +858,17 @@
+@@ -844,18 +875,20 @@ globfree(pglob)
+ pglob->gl_pathv = NULL;
+ }
}
++#endif /* !BUILDING_VARIANT */
static DIR *
-g_opendir(str, pglob)
return (NULL);
}
-@@ -866,14 +879,15 @@
+@@ -866,14 +899,15 @@ g_opendir(str, pglob)
}
static int
errno = ENAMETOOLONG;
return (-1);
}
-@@ -883,14 +897,15 @@
+@@ -883,14 +917,15 @@ g_lstat(fn, sb, pglob)
}
static int
errno = ENAMETOOLONG;
return (-1);
}
-@@ -912,17 +927,19 @@
+@@ -899,7 +934,8 @@ g_stat(fn, sb, pglob)
+ return(stat(buf, sb));
}
- static int
+-static Char *
++#ifndef BUILDING_VARIANT
++__private_extern__ Char *
+ g_strchr(str, ch)
+ Char *str;
+ wchar_t ch;
+@@ -911,18 +947,20 @@ g_strchr(str, ch)
+ return (NULL);
+ }
+
+-static int
-g_Ctoc(str, buf, len)
++__private_extern__ int
+g_Ctoc(str, buf, len, loc)
const Char *str;
char *buf;
if (clen == (size_t)-1)
return (1);
if (*str == L'\0')
+@@ -954,3 +992,4 @@ qprintf(str, s)
+ (void)printf("\n");
+ }
+ #endif
++#endif /* !BUILDING_VARIANT */
projects / apple / libc.git / blobdiff