Loading...
--- Libc/Libc-498/regex/FreeBSD/regcomp.c.patch
+++ Libc/Libc-763.11/regex/FreeBSD/regcomp.c.patch
@@ -1,15 +1,15 @@
---- regcomp.c.orig 2004-11-25 11:38:32.000000000 -0800
-+++ regcomp.c 2005-04-05 14:46:18.000000000 -0700
-@@ -43,6 +43,8 @@
+--- regcomp.c.orig 2010-06-21 14:05:04.000000000 -0700
++++ regcomp.c 2010-06-21 14:23:51.000000000 -0700
+@@ -39,6 +39,8 @@ static char sccsid[] = "@(#)regcomp.c 8.
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.34 2004/10/03 15:42:59 stefanf Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.36 2007/06/11 03:05:54 delphij Exp $");
+#include "xlocale_private.h"
+
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
-@@ -73,6 +75,9 @@
+@@ -69,6 +71,9 @@ struct parse {
sopno ssize; /* malloced strip size (allocated) */
sopno slen; /* malloced strip length (used) */
int ncsalloc; /* number of csets allocated */
@@ -19,7 +19,7 @@
struct re_guts *g;
# define NPAREN 10 /* we need to remember () 1-9 for back refs */
sopno pbegin[NPAREN]; /* -> ( ([0] unused) */
-@@ -97,7 +102,7 @@
+@@ -93,7 +98,7 @@ static void p_b_cclass(struct parse *p,
static void p_b_eclass(struct parse *p, cset *cs);
static wint_t p_b_symbol(struct parse *p);
static wint_t p_b_coll_elem(struct parse *p, wint_t endc);
@@ -28,7 +28,7 @@
static void bothcases(struct parse *p, wint_t ch);
static void ordinary(struct parse *p, wint_t ch);
static void nonnewline(struct parse *p);
-@@ -108,7 +113,7 @@
+@@ -104,7 +109,7 @@ static void freeset(struct parse *p, cse
static void CHadd(struct parse *p, cset *cs, wint_t ch);
static void CHaddrange(struct parse *p, cset *cs, wint_t min, wint_t max);
static void CHaddtype(struct parse *p, cset *cs, wctype_t wct);
@@ -37,7 +37,7 @@
static sopno dupl(struct parse *p, sopno start, sopno finish);
static void doemit(struct parse *p, sop op, size_t opnd);
static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
-@@ -227,10 +232,14 @@
+@@ -222,10 +227,14 @@ regcomp(regex_t * __restrict preg,
p->end = p->next + len;
p->error = 0;
p->ncsalloc = 0;
@@ -52,7 +52,7 @@
g->sets = NULL;
g->ncsets = 0;
g->cflags = cflags;
-@@ -308,8 +317,12 @@
+@@ -302,8 +311,12 @@ p_ere(struct parse *p,
conc = HERE();
while (MORE() && (c = PEEK()) != '|' && c != stop)
p_ere_exp(p);
@@ -66,7 +66,7 @@
if (!EAT('|'))
break; /* NOTE BREAK OUT */
-@@ -417,7 +430,7 @@
+@@ -410,7 +423,7 @@ p_ere_exp(struct parse *p)
ordinary(p, wc);
break;
case '{': /* okay as ordinary except if digit follows */
@@ -75,7 +75,7 @@
/* FALLTHROUGH */
default:
p->next--;
-@@ -431,7 +444,7 @@
+@@ -424,7 +437,7 @@ p_ere_exp(struct parse *p)
c = PEEK();
/* we call { a repetition if followed by a digit */
if (!( c == '*' || c == '+' || c == '?' ||
@@ -84,7 +84,7 @@
return; /* no repetition, we're done */
NEXT();
-@@ -460,7 +473,7 @@
+@@ -453,7 +466,7 @@ p_ere_exp(struct parse *p)
case '{':
count = p_count(p);
if (EAT(',')) {
@@ -93,7 +93,7 @@
count2 = p_count(p);
(void)REQUIRE(count <= count2, REG_BADBR);
} else /* single number with comma */
-@@ -481,7 +494,7 @@
+@@ -474,7 +487,7 @@ p_ere_exp(struct parse *p)
return;
c = PEEK();
if (!( c == '*' || c == '+' || c == '?' ||
@@ -102,9 +102,9 @@
return;
SETERROR(REG_BADRPT);
}
-@@ -494,7 +507,12 @@
- p_str(p)
- struct parse *p;
+@@ -486,7 +499,12 @@ p_ere_exp(struct parse *p)
+ static void
+ p_str(struct parse *p)
{
+#if __DARWIN_UNIX03
+ if (!p->zerorepeats) REQUIRE(MORE(), REG_EMPTY);
@@ -115,7 +115,7 @@
while (MORE())
ordinary(p, WGETNEXT());
}
-@@ -534,8 +552,12 @@
+@@ -525,8 +543,12 @@ p_bre(struct parse *p,
p->g->iflags |= USEEOL;
p->g->neol++;
}
@@ -129,7 +129,7 @@
}
/*
-@@ -609,12 +631,22 @@
+@@ -599,12 +621,22 @@ p_simp_re(struct parse *p,
i = (c&~BACKSL) - '0';
assert(i < NPAREN);
if (p->pend[i] != 0) {
@@ -152,7 +152,7 @@
EMIT(O_BACK, i);
} else
SETERROR(REG_ESUBREG);
-@@ -637,9 +669,10 @@
+@@ -627,9 +659,10 @@ p_simp_re(struct parse *p,
INSERT(OQUEST_, pos);
ASTERN(O_QUEST, pos);
} else if (EATTWO('\\', '{')) {
@@ -164,7 +164,7 @@
count2 = p_count(p);
(void)REQUIRE(count <= count2, REG_BADBR);
} else /* single number with comma */
-@@ -670,7 +703,7 @@
+@@ -659,7 +692,7 @@ p_count(struct parse *p)
int count = 0;
int ndigits = 0;
@@ -173,7 +173,7 @@
count = count*10 + (GETNEXT() - '0');
ndigits++;
}
-@@ -709,10 +742,22 @@
+@@ -697,10 +730,22 @@ p_bracket(struct parse *p)
cs->icase = 1;
if (EAT('^'))
cs->invert = 1;
@@ -196,7 +196,7 @@
while (MORE() && PEEK() != ']' && !SEETWO('-', ']'))
p_b_term(p, cs);
if (EAT('-'))
-@@ -725,7 +770,7 @@
+@@ -713,7 +758,7 @@ p_bracket(struct parse *p)
if (cs->invert && p->g->cflags®_NEWLINE)
cs->bmp['\n' >> 3] |= 1 << ('\n' & 7);
@@ -205,7 +205,7 @@
ordinary(p, ch);
freeset(p, cs);
} else
-@@ -751,8 +796,16 @@
+@@ -737,8 +782,16 @@ p_b_term(struct parse *p, cset *cs)
c = (MORE2()) ? PEEK2() : '\0';
break;
case '-':
@@ -222,7 +222,7 @@
break;
default:
c = '\0';
-@@ -773,7 +826,11 @@
+@@ -759,7 +812,11 @@ p_b_term(struct parse *p, cset *cs)
NEXT2();
(void)REQUIRE(MORE(), REG_EBRACK);
c = PEEK();
@@ -234,7 +234,7 @@
p_b_eclass(p, cs);
(void)REQUIRE(MORE(), REG_EBRACK);
(void)REQUIRE(EATTWO('=', ']'), REG_ECOLLATE);
-@@ -792,14 +849,14 @@
+@@ -778,14 +835,14 @@ p_b_term(struct parse *p, cset *cs)
if (start == finish)
CHadd(p, cs, start);
else {
@@ -253,7 +253,7 @@
)
CHadd(p, cs, i);
}
-@@ -823,7 +880,7 @@
+@@ -807,7 +864,7 @@ p_b_cclass(struct parse *p, cset *cs)
wctype_t wct;
char clname[16];
@@ -262,7 +262,7 @@
NEXT();
len = p->next - sp;
if (len >= sizeof(clname) - 1) {
-@@ -832,7 +889,7 @@
+@@ -816,7 +873,7 @@ p_b_cclass(struct parse *p, cset *cs)
}
memcpy(clname, sp, len);
clname[len] = '\0';
@@ -271,7 +271,7 @@
SETERROR(REG_ECTYPE);
return;
}
-@@ -842,16 +899,40 @@
+@@ -826,14 +883,38 @@ p_b_cclass(struct parse *p, cset *cs)
/*
- p_b_eclass - parse an equivalence-class name and deal with it
== static void p_b_eclass(struct parse *p, cset *cs);
@@ -279,9 +279,7 @@
- * This implementation is incomplete. xxx
*/
static void
- p_b_eclass(p, cs)
- struct parse *p;
- cset *cs;
+ p_b_eclass(struct parse *p, cset *cs)
{
- wint_t c;
-
@@ -316,8 +314,12 @@
c = p_b_coll_elem(p, '=');
CHadd(p, cs, c);
}
-@@ -889,7 +970,7 @@
- struct cname *cp;
+@@ -866,10 +947,10 @@ p_b_coll_elem(struct parse *p,
+ wint_t endc) /* name ended by endc,']' */
+ {
+ char *sp = p->next;
+- struct cname *cp;
++ const struct cname *cp;
int len;
mbstate_t mbs;
- wchar_t wc;
@@ -325,7 +327,7 @@
size_t clen;
while (MORE() && !SEETWO(endc, ']'))
-@@ -903,9 +984,10 @@
+@@ -883,9 +964,10 @@ p_b_coll_elem(struct parse *p,
if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
return(cp->code); /* known name */
memset(&mbs, 0, sizeof(mbs));
@@ -339,18 +341,16 @@
SETERROR(REG_ILLSEQ);
else
SETERROR(REG_ECOLLATE); /* neither */
-@@ -914,17 +996,18 @@
+@@ -894,16 +976,16 @@ p_b_coll_elem(struct parse *p,
/*
- othercase - return the case counterpart of an alphabetic
- == static char othercase(int ch);
-+ == static char othercase(int ch, locale_t loc);
++ == static char othercase(wint_t ch, locale_t loc);
*/
static wint_t /* if no counterpart, return ch */
--othercase(ch)
-+othercase(ch, loc)
- wint_t ch;
-+locale_t loc;
+-othercase(wint_t ch)
++othercase(wint_t ch, locale_t loc)
{
- assert(iswalpha(ch));
- if (iswupper(ch))
@@ -365,7 +365,7 @@
else /* peculiar, but could happen */
return(ch);
}
-@@ -946,10 +1029,10 @@
+@@ -923,10 +1005,10 @@ bothcases(struct parse *p, wint_t ch)
size_t n;
mbstate_t mbs;
@@ -378,7 +378,7 @@
assert(n != (size_t)-1);
bracket[n] = ']';
bracket[n + 1] = '\0';
-@@ -971,7 +1054,7 @@
+@@ -946,7 +1028,7 @@ ordinary(struct parse *p, wint_t ch)
{
cset *cs;
@@ -387,7 +387,7 @@
bothcases(p, ch);
else if ((ch & OPDMASK) == ch)
EMIT(OCHAR, ch);
-@@ -1039,10 +1122,22 @@
+@@ -1012,10 +1094,22 @@ repeat(struct parse *p,
switch (REP(MAP(from), MAP(to))) {
case REP(0, 0): /* must be user doing this */
DROP(finish-start); /* drop the operand */
@@ -411,7 +411,7 @@
/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
INSERT(OCH_, start); /* offset is wrong... */
repeat(p, start+1, 1, to);
-@@ -1056,6 +1151,10 @@
+@@ -1029,6 +1123,10 @@ repeat(struct parse *p,
/* done */
break;
case REP(1, N): /* as x?x{1,n-1} */
@@ -422,7 +422,7 @@
/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
INSERT(OCH_, start);
ASTERN(OOR1, start);
-@@ -1063,6 +1162,7 @@
+@@ -1036,6 +1134,7 @@ repeat(struct parse *p,
EMIT(OOR2, 0); /* offset very wrong... */
AHEAD(THERE()); /* ...so fix it */
ASTERN(O_CH, THERETHERE());
@@ -430,7 +430,7 @@
copy = dupl(p, start+1, finish+1);
assert(copy == finish+4);
repeat(p, copy, 1, to-1);
-@@ -1099,7 +1199,7 @@
+@@ -1071,7 +1170,7 @@ wgetnext(struct parse *p)
size_t n;
memset(&mbs, 0, sizeof(mbs));
@@ -439,14 +439,12 @@
if (n == (size_t)-1 || n == (size_t)-2) {
SETERROR(REG_ILLSEQ);
return (0);
-@@ -1172,13 +1272,14 @@
+@@ -1139,12 +1238,12 @@ freeset(struct parse *p, cset *cs)
- returning it if so, otherwise returning OUT.
*/
static wint_t
--singleton(cs)
-+singleton(cs, loc)
- cset *cs;
-+locale_t loc;
+-singleton(cset *cs)
++singleton(cset *cs, locale_t loc)
{
wint_t i, s, n;
@@ -456,7 +454,7 @@
n++;
s = i;
}
-@@ -1215,9 +1316,9 @@
+@@ -1178,9 +1277,9 @@ CHadd(struct parse *p, cset *cs, wint_t
cs->wides[cs->nwides++] = ch;
}
if (cs->icase) {
@@ -468,7 +466,7 @@
cs->bmp[nch >> 3] |= 1 << (nch & 7);
}
}
-@@ -1262,7 +1363,7 @@
+@@ -1219,7 +1318,7 @@ CHaddtype(struct parse *p, cset *cs, wct
wctype_t *newtypes;
for (i = 0; i < NC; i++)
@@ -477,7 +475,7 @@
CHadd(p, cs, i);
newtypes = realloc(cs->types, (cs->ntypes + 1) *
sizeof(*cs->types));
-@@ -1451,6 +1552,7 @@
+@@ -1391,6 +1490,7 @@ findmust(struct parse *p, struct re_guts
char buf[MB_LEN_MAX];
size_t clen;
mbstate_t mbs;
@@ -485,7 +483,7 @@
/* avoid making error situations worse */
if (p->error != 0)
-@@ -1461,8 +1563,8 @@
+@@ -1401,8 +1501,8 @@ findmust(struct parse *p, struct re_guts
* multibyte character strings, but it's safe for at least
* UTF-8 (see RFC 3629).
*/
@@ -496,7 +494,7 @@
return;
/* find the longest OCHAR sequence in strip */
-@@ -1478,7 +1580,7 @@
+@@ -1418,7 +1518,7 @@ findmust(struct parse *p, struct re_guts
memset(&mbs, 0, sizeof(mbs));
newstart = scan - 1;
}
@@ -505,7 +503,7 @@
if (clen == (size_t)-1)
goto toohard;
newlen += clen;
-@@ -1597,7 +1699,7 @@
+@@ -1537,7 +1637,7 @@ findmust(struct parse *p, struct re_guts
while (cp < g->must + g->mlen) {
while (OP(s = *scan++) != OCHAR)
continue;