d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sed(1): Fix a mismatch and sync with the OpenBSD's commit.

Browse Source 
This was causing some strange behaviour.

Reported by:	olivier
Obtained from:	OpenBSD (CVS rev. 1.28)
This commit is contained in:
Pedro F. Giffuni 2016-06-01 16:53:02 +00:00
parent efe50fa18a
commit 7e77774311
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/sed/process.c
View File

@ -394,7 +394,7 @@ substitute(struct s_command *cp)
linenum, fname, cp->u.s->maxbref);
}
}
if (!regexec_e(re, s, 0, 0, 0, psl))
if (!regexec_e(re, ps, 0, 0, 0, psl))
return (0);
SS.len = 0; /* Clean substitute space. */
@ -404,7 +404,7 @@ substitute(struct s_command *cp)
do {
/* Copy the leading retained string. */
if (n <= 1 && match[0].rm_so - le)
if (n <= 1 && (match[0].rm_so > le))
cspace(&SS, s, match[0].rm_so - le, APPEND);
/* Skip zero-length matches right after other matches. */
@ -425,8 +425,8 @@ substitute(struct s_command *cp)
}
/* Move past this match. */
s += (match[0].rm_eo - le);
slen -= (match[0].rm_eo - le);
s = ps + match[0].rm_eo;
slen = psl - match[0].rm_eo;
le = match[0].rm_eo;
/*
@ -446,7 +446,8 @@ substitute(struct s_command *cp)
} else
lastempty = 0;
} while (n >= 0 && slen >= 0 && regexec_e(re, ps, 0, 0, le, psl));
} while (n >= 0 && slen >= 0 &&
regexec_e(re, ps, REG_NOTBOL, 0, le, psl));
/* Did not find the requested number of matches. */
if (n > 1)