From: Glenn L McGrath Date: Wed, 9 Apr 2003 15:52:32 +0000 (-0000) Subject: Really fix the 'r' command X-Git-Tag: 1_00_pre1~119 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d7fe39b587d78020356eee4636c86e5151634baf;p=oweals%2Fbusybox.git Really fix the 'r' command --- diff --git a/editors/sed.c b/editors/sed.c index 5ac7889ec..5dd5b2654 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -994,14 +994,17 @@ static void process_file(FILE * file) case 'r':{ FILE *outfile; - outfile = fopen(sed_cmd->filename, "r"); if (outfile) { + char *line; + while ((line = bb_get_chomped_line_from_file(outfile)) != NULL) { + pattern_space = xrealloc(pattern_space, strlen(line) + strlen(pattern_space) + 2); + strcat(pattern_space, "\n"); + strcat(pattern_space, line); + } bb_xprint_and_close_file(outfile); } - /* else if we couldn't open the output file, - * no biggie, just don't print anything */ - altered++; + } break; case 'q': /* Branch to end of script and quit */