aboutsummaryrefslogtreecommitdiff
path: root/editors/sed.c
diff options
context:
space:
mode:
Diffstat (limited to 'editors/sed.c')
-rw-r--r--editors/sed.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/editors/sed.c b/editors/sed.c
index 57d3dda16..d3444003e 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -315,7 +315,7 @@ static int parse_regex_delim(const char *cmdstr, char **match, char **replace)
315 /* verify that the 's' or 'y' is followed by something. That something 315 /* verify that the 's' or 'y' is followed by something. That something
316 * (typically a 'slash') is now our regexp delimiter... */ 316 * (typically a 'slash') is now our regexp delimiter... */
317 if (*cmdstr == '\0') 317 if (*cmdstr == '\0')
318 bb_error_msg_and_die("bad format in substitution expression"); 318 bb_simple_error_msg_and_die("bad format in substitution expression");
319 delimiter = *cmdstr_ptr++; 319 delimiter = *cmdstr_ptr++;
320 320
321 /* save the match string */ 321 /* save the match string */
@@ -360,7 +360,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
360 } else { 360 } else {
361 *regex = G.previous_regex_ptr; 361 *regex = G.previous_regex_ptr;
362 if (!G.previous_regex_ptr) 362 if (!G.previous_regex_ptr)
363 bb_error_msg_and_die("no previous regexp"); 363 bb_simple_error_msg_and_die("no previous regexp");
364 } 364 }
365 /* Move position to next character after last delimiter */ 365 /* Move position to next character after last delimiter */
366 pos += (next+1); 366 pos += (next+1);
@@ -378,7 +378,7 @@ static int parse_file_cmd(/*sed_cmd_t *sed_cmd,*/ const char *filecmdstr, char *
378 start = skip_whitespace(filecmdstr); 378 start = skip_whitespace(filecmdstr);
379 eol = strchrnul(start, '\n'); 379 eol = strchrnul(start, '\n');
380 if (eol == start) 380 if (eol == start)
381 bb_error_msg_and_die("empty filename"); 381 bb_simple_error_msg_and_die("empty filename");
382 382
383 if (*eol) { 383 if (*eol) {
384 /* If lines glued together, put backslash back. */ 384 /* If lines glued together, put backslash back. */
@@ -468,7 +468,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
468 goto out; 468 goto out;
469 default: 469 default:
470 dbg("s bad flags:'%s'", substr + idx); 470 dbg("s bad flags:'%s'", substr + idx);
471 bb_error_msg_and_die("bad option in substitution expression"); 471 bb_simple_error_msg_and_die("bad option in substitution expression");
472 } 472 }
473 } 473 }
474 out: 474 out:
@@ -688,7 +688,7 @@ static void add_cmd(const char *cmdstr)
688 idx--; /* if 0, trigger error check below */ 688 idx--; /* if 0, trigger error check below */
689 } 689 }
690 if (idx < 0) 690 if (idx < 0)
691 bb_error_msg_and_die("no address after comma"); 691 bb_simple_error_msg_and_die("no address after comma");
692 sed_cmd->end_line_orig = sed_cmd->end_line; 692 sed_cmd->end_line_orig = sed_cmd->end_line;
693 } 693 }
694 694
@@ -706,7 +706,7 @@ static void add_cmd(const char *cmdstr)
706 706
707 /* last part (mandatory) will be a command */ 707 /* last part (mandatory) will be a command */
708 if (!*cmdstr) 708 if (!*cmdstr)
709 bb_error_msg_and_die("missing command"); 709 bb_simple_error_msg_and_die("missing command");
710 sed_cmd->cmd = *cmdstr++; 710 sed_cmd->cmd = *cmdstr++;
711 cmdstr = parse_cmd_args(sed_cmd, cmdstr); 711 cmdstr = parse_cmd_args(sed_cmd, cmdstr);
712 712
@@ -791,7 +791,7 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
791 if (!current_regex) { 791 if (!current_regex) {
792 current_regex = G.previous_regex_ptr; 792 current_regex = G.previous_regex_ptr;
793 if (!current_regex) 793 if (!current_regex)
794 bb_error_msg_and_die("no previous regexp"); 794 bb_simple_error_msg_and_die("no previous regexp");
795 } 795 }
796 G.previous_regex_ptr = current_regex; 796 G.previous_regex_ptr = current_regex;
797 797
@@ -962,7 +962,7 @@ static void puts_maybe_newline(char *s, FILE *file, char *last_puts_char, char l
962 962
963 if (ferror(file)) { 963 if (ferror(file)) {
964 xfunc_error_retval = 4; /* It's what gnu sed exits with... */ 964 xfunc_error_retval = 4; /* It's what gnu sed exits with... */
965 bb_error_msg_and_die(bb_msg_write_error); 965 bb_simple_error_msg_and_die(bb_msg_write_error);
966 } 966 }
967 *last_puts_char = lpc; 967 *last_puts_char = lpc;
968} 968}
@@ -1192,7 +1192,7 @@ static void process_files(void)
1192 } 1192 }
1193 sed_cmd = sed_cmd->next; 1193 sed_cmd = sed_cmd->next;
1194 if (!sed_cmd) 1194 if (!sed_cmd)
1195 bb_error_msg_and_die("unterminated {"); 1195 bb_simple_error_msg_and_die("unterminated {");
1196 } 1196 }
1197 } 1197 }
1198 continue; 1198 continue;