Loading...
--- Libc/Libc-594.9.4/gen/FreeBSD/glob.c.patch
+++ Libc/Libc-391/gen/FreeBSD/glob.c.patch
@@ -1,6 +1,6 @@
---- glob.c.orig 2009-05-12 11:21:55.000000000 -0700
-+++ glob.c 2009-05-20 16:26:02.000000000 -0700
-@@ -40,6 +40,8 @@ static char sccsid[] = "@(#)glob.c 8.3 (
+--- 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 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.22 2004/07/29 03:48:52 tjr Exp $");
@@ -9,32 +9,17 @@
/*
* glob(3) -- a superset of the one defined in POSIX 1003.2.
*
-@@ -143,33 +145,40 @@ typedef char Char;
- #define ismeta(c) (((c)&M_QUOTE) != 0)
-
-
--static int compare(const void *, const void *);
+@@ -144,24 +146,24 @@
+
+
+ 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 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_Ctoc(const Char *, char *, u_int, 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
@@ -44,32 +29,24 @@
-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
-
--int
--glob(pattern, flags, errfunc, pglob)
-+static int
-+__glob(pattern, pglob)
- const char *pattern;
-- int flags, (*errfunc)(const char *, int);
- glob_t *pglob;
- {
- const u_char *patnext;
-@@ -178,30 +187,30 @@ glob(pattern, flags, errfunc, pglob)
+@@ -178,6 +180,8 @@
mbstate_t mbs;
wchar_t wc;
size_t clen;
@@ -77,29 +54,10 @@
+ int mb_cur_max = MB_CUR_MAX_L(loc);
patnext = (u_char *) pattern;
-- if (!(flags & GLOB_APPEND)) {
-+ if (!(pglob->gl_flags & GLOB_APPEND)) {
- pglob->gl_pathc = 0;
- pglob->gl_pathv = NULL;
-- if (!(flags & GLOB_DOOFFS))
-+ if (!(pglob->gl_flags & GLOB_DOOFFS))
- pglob->gl_offs = 0;
- }
-- if (flags & GLOB_LIMIT) {
-+ if (pglob->gl_flags & GLOB_LIMIT) {
- limit = pglob->gl_matchc;
- if (limit == 0)
- limit = ARG_MAX;
- } else
- limit = 0;
-- pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-- pglob->gl_errfunc = errfunc;
- pglob->gl_matchc = 0;
-
- bufnext = patbuf;
+ if (!(flags & GLOB_APPEND)) {
+@@ -200,8 +204,8 @@
bufend = bufnext + MAXPATHLEN - 1;
-- if (flags & GLOB_NOESCAPE) {
-+ if (pglob->gl_flags & GLOB_NOESCAPE) {
+ if (flags & GLOB_NOESCAPE) {
memset(&mbs, 0, sizeof(mbs));
- while (bufend - bufnext >= MB_CUR_MAX) {
- clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs);
@@ -108,7 +66,7 @@
if (clen == (size_t)-1 || clen == (size_t)-2)
return (GLOB_NOMATCH);
else if (clen == 0)
-@@ -212,7 +221,7 @@ glob(pattern, flags, errfunc, pglob)
+@@ -212,7 +216,7 @@
} else {
/* Protect the quoted characters. */
memset(&mbs, 0, sizeof(mbs));
@@ -117,7 +75,7 @@
if (*patnext == QUOTE) {
if (*++patnext == EOS) {
*bufnext++ = QUOTE | M_PROTECT;
-@@ -221,7 +230,7 @@ glob(pattern, flags, errfunc, pglob)
+@@ -221,7 +225,7 @@
prot = M_PROTECT;
} else
prot = 0;
@@ -126,51 +84,19 @@
if (clen == (size_t)-1 || clen == (size_t)-2)
return (GLOB_NOMATCH);
else if (clen == 0)
-@@ -232,11 +241,40 @@ glob(pattern, flags, errfunc, pglob)
- }
+@@ -233,9 +237,9 @@
*bufnext = EOS;
-- if (flags & GLOB_BRACE)
+ if (flags & GLOB_BRACE)
- return globexp1(patbuf, pglob, &limit);
-+ if (pglob->gl_flags & GLOB_BRACE)
+ return globexp1(patbuf, pglob, &limit, loc);
else
- return glob0(patbuf, pglob, &limit);
+ return glob0(patbuf, pglob, &limit, loc);
-+}
-+
-+int
-+glob(pattern, flags, errfunc, pglob)
-+ const char *pattern;
-+ int flags, (*errfunc)(const char *, int);
-+ glob_t *pglob;
-+{
-+#ifdef __BLOCKS__
-+ pglob->gl_flags = flags & ~(GLOB_MAGCHAR | _GLOB_ERR_BLOCK);
-+#else /* !__BLOCKS__ */
-+ pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-+#endif /* __BLOCKS__ */
-+ pglob->gl_errfunc = errfunc;
-+ return __glob(pattern, pglob);
-+}
-+
-+#ifdef __BLOCKS__
-+int
-+glob_b(pattern, flags, errblk, pglob)
-+ const char *pattern;
-+ int flags, (^errblk)(const char *, int);
-+ glob_t *pglob;
-+{
-+ pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-+ pglob->gl_flags |= _GLOB_ERR_BLOCK;
-+ pglob->gl_errblk = errblk;
-+ return __glob(pattern, pglob);
- }
-+#endif /* __BLOCKS__ */
+ }
/*
- * Expand recursively a glob {} pattern. When there is no more expansion
-@@ -244,23 +282,24 @@ glob(pattern, flags, errfunc, pglob)
+@@ -244,23 +248,24 @@
* characters
*/
static int
@@ -199,7 +125,7 @@
}
-@@ -270,10 +309,11 @@ globexp1(pattern, pglob, limit)
+@@ -270,10 +275,11 @@
* If it fails then it tries to glob the rest of the pattern and returns.
*/
static int
@@ -212,7 +138,7 @@
{
int i;
Char *lm, *ls;
-@@ -310,7 +350,7 @@ globexp2(ptr, pattern, pglob, rv, limit)
+@@ -310,7 +316,7 @@
/* Non matching braces; just glob the pattern */
if (i != 0 || *pe == EOS) {
@@ -221,7 +147,7 @@
return 0;
}
-@@ -357,7 +397,7 @@ globexp2(ptr, pattern, pglob, rv, limit)
+@@ -357,7 +363,7 @@
#ifdef DEBUG
qprintf("globexp2:", patbuf);
#endif
@@ -230,28 +156,7 @@
/* move after the comma, to the next string */
pl = pm + 1;
-@@ -373,10 +413,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 +479,7 @@ globtilde(pattern, patbuf, patbuf_len, p
-
- return patbuf;
- }
-+#endif /* BUILDING_VARIANT */
-
-
- /*
-@@ -447,13 +489,15 @@ globtilde(pattern, patbuf, patbuf_len, p
+@@ -447,10 +453,11 @@
* if things went well, nonzero if errors occurred.
*/
static int
@@ -263,24 +168,8 @@
+ locale_t loc;
{
const Char *qpatnext;
-- int c, err, oldpathc;
-+ Char c;
-+ int err, oldpathc;
- Char *bufnext, patbuf[MAXPATHLEN];
-
- qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
-@@ -462,6 +506,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 +560,7 @@ glob0(pattern, pglob, limit)
+ int c, err, oldpathc;
+@@ -512,7 +519,7 @@
qprintf("glob0:", patbuf);
#endif
@@ -289,7 +178,7 @@
return(err);
/*
-@@ -525,7 +573,7 @@ glob0(pattern, pglob, limit)
+@@ -525,7 +532,7 @@
if (((pglob->gl_flags & GLOB_NOCHECK) ||
((pglob->gl_flags & GLOB_NOMAGIC) &&
!(pglob->gl_flags & GLOB_MAGCHAR))))
@@ -298,20 +187,8 @@
else
return(GLOB_NOMATCH);
}
-@@ -535,18 +583,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 */
+@@ -543,10 +550,11 @@
+ }
static int
-glob1(pattern, pglob, limit)
@@ -323,7 +200,7 @@
{
Char pathbuf[MAXPATHLEN];
-@@ -554,7 +605,7 @@ glob1(pattern, pglob, limit)
+@@ -554,7 +562,7 @@
if (*pattern == EOS)
return(0);
return(glob2(pathbuf, pathbuf, pathbuf + MAXPATHLEN - 1,
@@ -332,7 +209,7 @@
}
/*
-@@ -563,10 +614,11 @@ glob1(pattern, pglob, limit)
+@@ -563,10 +571,11 @@
* meta characters.
*/
static int
@@ -345,7 +222,7 @@
{
struct stat sb;
Char *p, *q;
-@@ -579,13 +631,13 @@ glob2(pathbuf, pathend, pathend_last, pa
+@@ -579,13 +588,13 @@
for (anymeta = 0;;) {
if (*pattern == EOS) { /* End of pattern? */
*pathend = EOS;
@@ -361,7 +238,7 @@
S_ISDIR(sb.st_mode)))) {
if (pathend + 1 > pathend_last)
return (GLOB_ABORTED);
-@@ -593,7 +645,7 @@ glob2(pathbuf, pathend, pathend_last, pa
+@@ -593,7 +602,7 @@
*pathend = EOS;
}
++pglob->gl_matchc;
@@ -370,7 +247,7 @@
}
/* Find end of next segment, copy tentatively to pathend. */
-@@ -617,16 +669,17 @@ glob2(pathbuf, pathend, pathend_last, pa
+@@ -617,16 +626,17 @@
}
} else /* Need expansion, recurse. */
return(glob3(pathbuf, pathend, pathend_last, pattern, p,
@@ -390,7 +267,7 @@
{
struct dirent *dp;
DIR *dirp;
-@@ -646,15 +699,22 @@ glob3(pathbuf, pathend, pathend_last, pa
+@@ -646,10 +656,10 @@
*pathend = EOS;
errno = 0;
@@ -401,23 +278,9 @@
- 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)
-+#ifdef __BLOCKS__
-+ if (pglob->gl_flags & _GLOB_ERR_BLOCK) {
-+ if (pglob->gl_errblk(buf, errno))
-+ return (GLOB_ABORTED);
-+ } else
-+#endif /* __BLOCKS__ */
-+ if (pglob->gl_errfunc(buf, errno))
- return (GLOB_ABORTED);
- }
-+ if (pglob->gl_flags & GLOB_ERR)
-+ return (GLOB_ABORTED);
- return(0);
- }
-
-@@ -679,7 +739,7 @@ glob3(pathbuf, pathend, pathend_last, pa
+ if (pglob->gl_errfunc(buf, errno) ||
+ pglob->gl_flags & GLOB_ERR)
+@@ -679,7 +689,7 @@
dc = pathend;
sc = (u_char *) dp->d_name;
while (dc < pathend_last) {
@@ -426,7 +289,7 @@
if (clen == (size_t)-1 || clen == (size_t)-2) {
wc = *sc;
clen = 1;
-@@ -689,12 +749,12 @@ glob3(pathbuf, pathend, pathend_last, pa
+@@ -689,12 +699,12 @@
break;
sc += clen;
}
@@ -441,21 +304,11 @@
if (err)
break;
}
-@@ -707,6 +767,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 +782,12 @@ glob3(pathbuf, pathend, pathend_last, pa
- * Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
+@@ -722,10 +732,11 @@
* 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;
@@ -464,7 +317,7 @@
{
char **pathv;
int i;
-@@ -760,9 +822,9 @@ globextend(path, pglob, limit)
+@@ -760,9 +771,9 @@
for (p = path; *p++;)
continue;
@@ -476,20 +329,18 @@
free(copy);
return (GLOB_NOSPACE);
}
-@@ -776,9 +838,10 @@ globextend(path, pglob, limit)
- * pattern matching function for filenames. Each occurrence of the *
+@@ -777,8 +788,9 @@
* 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 +853,7 @@ match(name, pat, patend)
+@@ -790,7 +802,7 @@
if (pat == patend)
return(1);
do
@@ -498,7 +349,7 @@
return(1);
while (*name++ != EOS);
return(0);
-@@ -806,10 +869,10 @@ match(name, pat, patend)
+@@ -806,10 +818,10 @@
++pat;
while (((c = *pat++) & M_MASK) != M_END)
if ((*pat & M_MASK) == M_RNG) {
@@ -512,11 +363,8 @@
)
ok = 1;
pat += 2;
-@@ -844,18 +907,20 @@ globfree(pglob)
- pglob->gl_pathv = NULL;
- }
- }
-+#endif /* !BUILDING_VARIANT */
+@@ -846,16 +858,17 @@
+ }
static DIR *
-g_opendir(str, pglob)
@@ -535,7 +383,7 @@
return (NULL);
}
-@@ -866,14 +931,15 @@ g_opendir(str, pglob)
+@@ -866,14 +879,15 @@
}
static int
@@ -553,7 +401,7 @@
errno = ENAMETOOLONG;
return (-1);
}
-@@ -883,14 +949,15 @@ g_lstat(fn, sb, pglob)
+@@ -883,14 +897,15 @@
}
static int
@@ -571,23 +419,11 @@
errno = ENAMETOOLONG;
return (-1);
}
-@@ -899,7 +966,8 @@ g_stat(fn, sb, pglob)
- return(stat(buf, sb));
- }
-
--static Char *
-+#ifndef BUILDING_VARIANT
-+__private_extern__ Char *
- g_strchr(str, ch)
- Char *str;
- wchar_t ch;
-@@ -911,18 +979,20 @@ g_strchr(str, ch)
- return (NULL);
- }
-
--static int
+@@ -912,17 +927,19 @@
+ }
+
+ static int
-g_Ctoc(str, buf, len)
-+__private_extern__ int
+g_Ctoc(str, buf, len, loc)
const Char *str;
char *buf;
@@ -606,8 +442,3 @@
if (clen == (size_t)-1)
return (1);
if (*str == L'\0')
-@@ -954,3 +1024,4 @@ qprintf(str, s)
- (void)printf("\n");
- }
- #endif
-+#endif /* !BUILDING_VARIANT */