From: Glenn L McGrath Date: Wed, 9 Apr 2003 15:26:14 +0000 (-0000) Subject: Fix the sed 'r' command X-Git-Tag: 1_00_pre1~120 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d87a7ac26947fefa8530559e9eb7f6f49e1b777a;p=oweals%2Fbusybox.git Fix the sed 'r' command --- diff --git a/editors/sed.c b/editors/sed.c index 912318c04..5ac7889ec 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -443,7 +443,6 @@ static int parse_file_cmd(sed_cmd_t * sed_cmd, const char *filecmdstr) filenamelen = strcspn(&filecmdstr[idx], semicolon_whitespace); sed_cmd->filename = xmalloc(filenamelen + 1); safe_strncpy(sed_cmd->filename, &filecmdstr[idx], filenamelen + 1); - return idx + filenamelen; } @@ -996,10 +995,10 @@ static void process_file(FILE * file) case 'r':{ FILE *outfile; - puts(pattern_space); outfile = fopen(sed_cmd->filename, "r"); - if (outfile) + if (outfile) { bb_xprint_and_close_file(outfile); + } /* else if we couldn't open the output file, * no biggie, just don't print anything */ altered++;