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

Fix back references in substitute command for pax(1)

Browse Source 
pax(1) was trying to copy the back-referenced data from
the match pattern, not the matched data.

PR:		bin/118132
Obtained from:	Debian bug #451361
Reviewed by:	jilles
MFC after:	3 weeks
This commit is contained in:
Ulrich Spörlein 2010-05-24 06:33:14 +00:00
parent 4f13bbb691
commit c9022a35b2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=208484
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pax/pat_rep.c
View File

@ -76,7 +76,7 @@ static char * range_match(char *, int);
#ifdef NET2_REGEX
static int resub(regexp *, char *, char *, char *);
#else
static int resub(regex_t *, regmatch_t *, char *, char *, char *);
static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *);
#endif
/*
@ -929,7 +929,7 @@ rep_name(char *name, int *nlen, int prnt)
# ifdef NET2_REGEX
if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) {
# else
if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt))
if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt))
< 0) {
# endif
if (prnt)
@ -1071,7 +1071,7 @@ resub(regexp *prog, char *src, char *dest, char *destend)
*/
static int
resub(regex_t *rp, regmatch_t *pm, char *src, char *dest,
resub(regex_t *rp, regmatch_t *pm, char *orig, char *src, char *dest,
char *destend)
{
char *spt;
@ -1121,7 +1121,7 @@ resub(regex_t *rp, regmatch_t *pm, char *src, char *dest,
*/
if (len > (destend - dpt))
len = destend - dpt;
if (l_strncpy(dpt, src + pmpt->rm_so, len) != len)
if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len)
return(-1);
dpt += len;
}