Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-12 15:54:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix a problem with unsatisfied backrefs (noted by Martin Bene).

Browse Source
This commit is contained in:
Matt Kraai 2001-08-20 21:21:06 +00:00
parent 54eceffcae
commit a3e4f455ac
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/sed.c
View File

@ -490,7 +490,7 @@ static void load_cmd_file(char *filename)
} }
} }
static void print_subst_w_backrefs(const char *line, const char *replace, regmatch_t *regmatch) static void print_subst_w_backrefs(const char *line, const char *replace, regmatch_t *regmatch, int matches)
{ {
int i; int i;
@ -506,8 +506,9 @@ static void print_subst_w_backrefs(const char *line, const char *replace, regmat
tmpstr[1] = 0; tmpstr[1] = 0;
backref = atoi(tmpstr); backref = atoi(tmpstr);
/* print out the text held in regmatch[backref] */ /* print out the text held in regmatch[backref] */
for (j = regmatch[backref].rm_so; j < regmatch[backref].rm_eo; j++) if (backref <= matches && regmatch[backref].rm_so != -1)
fputc(line[j], stdout); for (j = regmatch[backref].rm_so; j < regmatch[backref].rm_eo; j++)
fputc(line[j], stdout);
} }
/* if we find a backslash escaped character, print the character */ /* if we find a backslash escaped character, print the character */
@ -555,7 +556,8 @@ static int do_subst_command(const struct sed_cmd *sed_cmd, const char *line)
fputc(hackline[i], stdout); fputc(hackline[i], stdout);
/* then print the substitution string */ /* then print the substitution string */
print_subst_w_backrefs(hackline, sed_cmd->replace, regmatch); print_subst_w_backrefs(hackline, sed_cmd->replace, regmatch,
sed_cmd->num_backrefs);
/* advance past the match */ /* advance past the match */
hackline += regmatch[0].rm_eo; hackline += regmatch[0].rm_eo;

10
sed.c
View File

@ -490,7 +490,7 @@ static void load_cmd_file(char *filename)
} }
} }
static void print_subst_w_backrefs(const char *line, const char *replace, regmatch_t *regmatch) static void print_subst_w_backrefs(const char *line, const char *replace, regmatch_t *regmatch, int matches)
{ {
int i; int i;
@ -506,8 +506,9 @@ static void print_subst_w_backrefs(const char *line, const char *replace, regmat
tmpstr[1] = 0; tmpstr[1] = 0;
backref = atoi(tmpstr); backref = atoi(tmpstr);
/* print out the text held in regmatch[backref] */ /* print out the text held in regmatch[backref] */
for (j = regmatch[backref].rm_so; j < regmatch[backref].rm_eo; j++) if (backref <= matches && regmatch[backref].rm_so != -1)
fputc(line[j], stdout); for (j = regmatch[backref].rm_so; j < regmatch[backref].rm_eo; j++)
fputc(line[j], stdout);
} }
/* if we find a backslash escaped character, print the character */ /* if we find a backslash escaped character, print the character */
@ -555,7 +556,8 @@ static int do_subst_command(const struct sed_cmd *sed_cmd, const char *line)
fputc(hackline[i], stdout); fputc(hackline[i], stdout);
/* then print the substitution string */ /* then print the substitution string */
print_subst_w_backrefs(hackline, sed_cmd->replace, regmatch); print_subst_w_backrefs(hackline, sed_cmd->replace, regmatch,
sed_cmd->num_backrefs);
/* advance past the match */ /* advance past the match */
hackline += regmatch[0].rm_eo; hackline += regmatch[0].rm_eo;