emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix matching for the $ address (last line)

Browse Source
This commit is contained in:
Glenn L McGrath 2003-03-08 05:21:02 +00:00
parent 77831c11d1
commit 505bd0f15a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editors/sed.c
View File

@ -399,8 +399,8 @@ static char *parse_cmd_str(struct sed_cmd * const sed_cmd, const char *const cmd
* part1 part2 part3 * part1 part2 part3
*/ */
/* first part (if present) is an address: either a number or a /regex/ */ /* first part (if present) is an address: either a '$', a number or a /regex/ */
if (isdigit(cmdstr[idx]) || cmdstr[idx] == '/' || ( cmdstr[idx] == '\\' && cmdstr[idx+1] != '\\')) if ((cmdstr[idx] == '$') || (isdigit(cmdstr[idx])) || (cmdstr[idx] == '/') || ((cmdstr[idx] == '\\') && (cmdstr[idx+1] != '\\')))
idx = get_address(sed_cmd, cmdstr, &sed_cmd->beg_line, &sed_cmd->beg_match); idx = get_address(sed_cmd, cmdstr, &sed_cmd->beg_line, &sed_cmd->beg_match);
/* second part (if present) will begin with a comma */ /* second part (if present) will begin with a comma */
@ -645,14 +645,23 @@ static int do_subst_command(const struct sed_cmd *sed_cmd, char **line)
static void process_file(FILE *file) static void process_file(FILE *file)
{ {
char *line = NULL; char *line;
static int linenum = 0; /* GNU sed does not restart counting lines at EOF */ static int linenum = 0; /* GNU sed does not restart counting lines at EOF */
unsigned int still_in_range = 0; unsigned int still_in_range = 0;
int altered; int altered;
int i; int i;
line = get_line_from_file(file);
if (line == NULL) {
return;
}
/* go through every line in the file */ /* go through every line in the file */
while ((line = get_line_from_file(file)) != NULL) { do {
char *next_line;
/* Read one line in advance so we can act on the last line, the '$' address */
next_line = get_line_from_file(file);
chomp(line); chomp(line);
linenum++; linenum++;
@ -676,7 +685,7 @@ static void process_file(FILE *file)
/* this line matches our first address regex */ /* this line matches our first address regex */
(sed_cmd->beg_match && (regexec(sed_cmd->beg_match, line, 0, NULL, 0) == 0)) || (sed_cmd->beg_match && (regexec(sed_cmd->beg_match, line, 0, NULL, 0) == 0)) ||
/* we are currently within the beginning & ending address range */ /* we are currently within the beginning & ending address range */
still_in_range still_in_range || ((sed_cmd->beg_line == -1) && (next_line == NULL))
); );
if (sed_cmd->invert ^ matched) { if (sed_cmd->invert ^ matched) {
@ -811,7 +820,8 @@ static void process_file(FILE *file)
puts(line); puts(line);
free(line); free(line);
} line = next_line;
} while (line);
} }
extern int sed_main(int argc, char **argv) extern int sed_main(int argc, char **argv)