Loading...
--- Libc/Libc-583/regex/FreeBSD/engine.c.patch
+++ Libc/Libc-391.4.2/regex/FreeBSD/engine.c.patch
@@ -1,6 +1,6 @@
--- engine.c.orig 2004-11-25 11:38:32.000000000 -0800
-+++ engine.c 2005-04-18 16:52:09.000000000 -0700
-@@ -270,7 +270,7 @@ int eflags;
++++ engine.c 2005-02-24 14:25:22.000000000 -0800
+@@ -270,7 +270,7 @@
break;
assert(m->coldp < m->endp);
m->coldp += XMBRTOWC(NULL, m->coldp,
@@ -9,7 +9,7 @@
}
if (nmatch == 1 && !g->backrefs)
break; /* no further info needed */
-@@ -331,7 +331,7 @@ int eflags;
+@@ -331,7 +331,7 @@
NOTE("false alarm");
/* recycle starting later */
start = m->coldp + XMBRTOWC(NULL, m->coldp,
@@ -18,7 +18,7 @@
assert(start <= stop);
}
-@@ -409,7 +409,7 @@ sopno stopst;
+@@ -409,7 +409,7 @@
assert(nope);
break;
case OCHAR:
@@ -27,7 +27,7 @@
break;
case OBOL:
case OEOL:
-@@ -418,7 +418,7 @@ sopno stopst;
+@@ -418,7 +418,7 @@
break;
case OANY:
case OANYOF:
@@ -36,33 +36,7 @@
break;
case OBACK_:
case O_BACK:
-@@ -479,6 +479,10 @@ sopno stopst;
- sep = ssp;
- ssp = oldssp;
- }
-+ else if (tail==rest) {
-+ /* Fix for test expr 105 */
-+ ssp = oldssp;
-+ }
- assert(sep == rest); /* must exhaust substring */
- assert(slow(m, ssp, sep, ssub, esub) == rest);
- dp = dissect(m, ssp, sep, ssub, esub);
-@@ -531,6 +535,14 @@ sopno stopst;
- i = OPND(m->g->strip[ss]);
- assert(0 < i && i <= m->g->nsub);
- m->pmatch[i].rm_so = sp - m->offp;
-+ /* fix for T.regcomp 43: don't remember previous
-+ subexpression matches beyond the current one (i) */
-+ i++;
-+ while (i<= m->g->nsub) {
-+ m->pmatch[i].rm_so = -1;
-+ m->pmatch[i].rm_eo = -1;
-+ i++;
-+ }
- break;
- case ORPAREN:
- i = OPND(m->g->strip[ss]);
-@@ -585,14 +597,14 @@ sopno lev; /* PLUS nesting level */
+@@ -585,14 +585,14 @@
case OCHAR:
if (sp == stop)
return(NULL);
@@ -79,7 +53,7 @@
if (wc == BADCHAR)
return (NULL);
break;
-@@ -600,8 +612,8 @@ sopno lev; /* PLUS nesting level */
+@@ -600,8 +600,8 @@
if (sp == stop)
return (NULL);
cs = &m->g->sets[OPND(s)];
@@ -90,7 +64,7 @@
return(NULL);
break;
case OBOL:
-@@ -625,8 +637,8 @@ sopno lev; /* PLUS nesting level */
+@@ -625,8 +625,8 @@
(sp < m->endp && *(sp-1) == '\n' &&
(m->g->cflags®_NEWLINE)) ||
(sp > m->beginp &&
@@ -101,7 +75,7 @@
{ /* yes */ }
else
return(NULL);
-@@ -635,8 +647,8 @@ sopno lev; /* PLUS nesting level */
+@@ -635,8 +635,8 @@
if (( (sp == m->endp && !(m->eflags®_NOTEOL)) ||
(sp < m->endp && *sp == '\n' &&
(m->g->cflags®_NEWLINE)) ||
@@ -112,7 +86,7 @@
{ /* yes */ }
else
return(NULL);
-@@ -807,7 +819,7 @@ sopno stopst;
+@@ -807,7 +807,7 @@
if (p == m->endp)
c = OUT;
else
@@ -121,7 +95,7 @@
if (EQ(st, fresh))
coldp = p;
-@@ -831,12 +843,12 @@ sopno stopst;
+@@ -831,12 +831,12 @@
}
/* how about a word boundary? */
@@ -138,7 +112,7 @@
flagch = EOW;
}
if (flagch == BOW || flagch == EOW) {
-@@ -861,7 +873,7 @@ sopno stopst;
+@@ -861,7 +861,7 @@
assert(coldp != NULL);
m->coldp = coldp;
if (ISSET(st, stopst))
@@ -147,7 +121,7 @@
else
return(NULL);
}
-@@ -913,7 +925,7 @@ sopno stopst;
+@@ -913,7 +913,7 @@
c = OUT;
clen = 0;
} else
@@ -156,7 +130,7 @@
/* is there an EOL and/or BOL between lastc and c? */
flagch = '\0';
-@@ -935,12 +947,12 @@ sopno stopst;
+@@ -935,12 +935,12 @@
}
/* how about a word boundary? */
@@ -173,7 +147,7 @@
flagch = EOW;
}
if (flagch == BOW || flagch == EOW) {
-@@ -1031,7 +1043,7 @@ states aft; /* states already known re
+@@ -1031,7 +1031,7 @@
break;
case OANYOF:
cs = &g->sets[OPND(s)];