aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/awk.c4
-rw-r--r--editors/diff.c4
-rw-r--r--editors/ed.c34
-rw-r--r--editors/patch_bbox.c6
-rw-r--r--editors/patch_toybox.c2
-rw-r--r--editors/sed.c18
-rw-r--r--editors/vi.c2
7 files changed, 35 insertions, 35 deletions
diff --git a/editors/awk.c b/editors/awk.c
index d25508e5d..f19990901 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2633,7 +2633,7 @@ static var *evaluate(node *op, var *res)
if (opn == '|') {
rsm->F = popen(R.s, "w");
if (rsm->F == NULL)
- bb_perror_msg_and_die("popen");
+ bb_simple_perror_msg_and_die("popen");
rsm->is_pipe = 1;
} else {
rsm->F = xfopen(R.s, opn=='w' ? "w" : "a");
@@ -3246,7 +3246,7 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
argv += optind;
//argc -= optind;
if (opt & OPT_W)
- bb_error_msg("warning: option -W is ignored");
+ bb_simple_error_msg("warning: option -W is ignored");
if (opt & OPT_F) {
unescape_string_in_place(opt_F);
setvar_s(intvar[FS], opt_F);
diff --git a/editors/diff.c b/editors/diff.c
index 1462a9b18..dc40ab4f1 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -1006,7 +1006,7 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
xfunc_error_retval = 1;
if (gotstdin && (S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode)))
- bb_error_msg_and_die("can't compare stdin to a directory");
+ bb_simple_error_msg_and_die("can't compare stdin to a directory");
/* Compare metadata to check if the files are the same physical file.
*
@@ -1037,7 +1037,7 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_DIFF_DIR
diffdir(file, s_start);
#else
- bb_error_msg_and_die("no support for directory comparison");
+ bb_simple_error_msg_and_die("no support for directory comparison");
#endif
} else {
bool dirfile = S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode);
diff --git a/editors/ed.c b/editors/ed.c
index 1a36add39..d3ae8da92 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -165,7 +165,7 @@ static NOINLINE int searchLines(const char *str, int num1, int num2)
if (*str == '\0') {
if (searchString[0] == '\0') {
- bb_error_msg("no previous search string");
+ bb_simple_error_msg("no previous search string");
return 0;
}
str = searchString;
@@ -228,7 +228,7 @@ static const char* getNum(const char *cp, smallint *retHaveNum, int *retNum)
case '\'':
cp++;
if ((unsigned)(*cp - 'a') >= 26) {
- bb_error_msg("bad mark name");
+ bb_simple_error_msg("bad mark name");
return NULL;
}
haveNum = TRUE;
@@ -314,7 +314,7 @@ static int insertLine(int num, const char *data, int len)
LINE *newLp, *lp;
if ((num < 1) || (num > lastNum + 1)) {
- bb_error_msg("inserting at bad line number");
+ bb_simple_error_msg("inserting at bad line number");
return FALSE;
}
@@ -384,7 +384,7 @@ static int readLines(const char *file, int num)
char *cp;
if ((num < 1) || (num > lastNum + 1)) {
- bb_error_msg("bad line for read");
+ bb_simple_error_msg("bad line for read");
return FALSE;
}
@@ -629,7 +629,7 @@ static void subCommand(const char *cmd, int num1, int num2)
cp = buf;
if (isblank(*cp) || (*cp == '\0')) {
- bb_error_msg("bad delimiter for substitute");
+ bb_simple_error_msg("bad delimiter for substitute");
return;
}
@@ -638,7 +638,7 @@ static void subCommand(const char *cmd, int num1, int num2)
cp = strchr(cp, delim);
if (cp == NULL) {
- bb_error_msg("missing 2nd delimiter for substitute");
+ bb_simple_error_msg("missing 2nd delimiter for substitute");
return;
}
@@ -660,13 +660,13 @@ static void subCommand(const char *cmd, int num1, int num2)
printFlag = TRUE;
break;
default:
- bb_error_msg("unknown option for substitute");
+ bb_simple_error_msg("unknown option for substitute");
return;
}
if (*oldStr == '\0') {
if (searchString[0] == '\0') {
- bb_error_msg("no previous search string");
+ bb_simple_error_msg("no previous search string");
return;
}
oldStr = searchString;
@@ -846,7 +846,7 @@ static void doCommands(void)
case 'f':
if (*cp != '\0' && *cp != ' ') {
- bb_error_msg("bad file command");
+ bb_simple_error_msg("bad file command");
break;
}
cp = skip_whitespace(cp);
@@ -870,7 +870,7 @@ static void doCommands(void)
case 'k':
cp = skip_whitespace(cp);
if ((unsigned)(*cp - 'a') >= 26 || cp[1]) {
- bb_error_msg("bad mark name");
+ bb_simple_error_msg("bad mark name");
break;
}
marks[(unsigned)(*cp - 'a')] = num2;
@@ -887,7 +887,7 @@ static void doCommands(void)
case 'q':
cp = skip_whitespace(cp);
if (have1 || *cp) {
- bb_error_msg("bad quit command");
+ bb_simple_error_msg("bad quit command");
break;
}
if (!dirty)
@@ -903,12 +903,12 @@ static void doCommands(void)
case 'r':
if (*cp != '\0' && *cp != ' ') {
- bb_error_msg("bad read command");
+ bb_simple_error_msg("bad read command");
break;
}
cp = skip_whitespace(cp);
if (*cp == '\0') {
- bb_error_msg("no file name");
+ bb_simple_error_msg("no file name");
break;
}
if (!have1)
@@ -925,14 +925,14 @@ static void doCommands(void)
case 'w':
if (*cp != '\0' && *cp != ' ') {
- bb_error_msg("bad write command");
+ bb_simple_error_msg("bad write command");
break;
}
cp = skip_whitespace(cp);
if (*cp == '\0') {
cp = fileName;
if (!cp) {
- bb_error_msg("no file name specified");
+ bb_simple_error_msg("no file name specified");
break;
}
}
@@ -960,7 +960,7 @@ static void doCommands(void)
case '.':
if (have1) {
- bb_error_msg("no arguments allowed");
+ bb_simple_error_msg("no arguments allowed");
break;
}
printLines(curNum, curNum, FALSE);
@@ -984,7 +984,7 @@ static void doCommands(void)
break;
default:
- bb_error_msg("unimplemented command");
+ bb_simple_error_msg("unimplemented command");
break;
}
}
diff --git a/editors/patch_bbox.c b/editors/patch_bbox.c
index 8e09ef488..d1f1ee2d6 100644
--- a/editors/patch_bbox.c
+++ b/editors/patch_bbox.c
@@ -30,7 +30,7 @@ static unsigned copy_lines(FILE *src_stream, FILE *dst_stream, unsigned lines_co
break;
}
if (fputs(line, dst_stream) == EOF) {
- bb_perror_msg_and_die("error writing to new file");
+ bb_simple_perror_msg_and_die("error writing to new file");
}
free(line);
lines_count--;
@@ -148,7 +148,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
new_filename = extract_filename(patch_line, patch_level, "+++ ");
if (!new_filename) {
- bb_error_msg_and_die("invalid patch");
+ bb_simple_error_msg_and_die("invalid patch");
}
/* Get access rights from the file to be patched */
@@ -209,7 +209,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
/* src_beg_line will be 0 if it's a new file */
count = src_beg_line - src_cur_line;
if (copy_lines(src_stream, dst_stream, count)) {
- bb_error_msg_and_die("bad src file");
+ bb_simple_error_msg_and_die("bad src file");
}
src_cur_line += count;
dst_cur_line += count;
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c
index 3ffbf9084..aebab8132 100644
--- a/editors/patch_toybox.c
+++ b/editors/patch_toybox.c
@@ -200,7 +200,7 @@ int copy_tempfile(int fdin, char *name, char **tempname)
*tempname = xasprintf("%sXXXXXX", name);
fd = mkstemp(*tempname);
- if(-1 == fd) bb_perror_msg_and_die("no temp file");
+ if(-1 == fd) bb_simple_perror_msg_and_die("no temp file");
// Set permissions of output file
fstat(fdin, &statbuf);
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)
/* verify that the 's' or 'y' is followed by something. That something
* (typically a 'slash') is now our regexp delimiter... */
if (*cmdstr == '\0')
- bb_error_msg_and_die("bad format in substitution expression");
+ bb_simple_error_msg_and_die("bad format in substitution expression");
delimiter = *cmdstr_ptr++;
/* save the match string */
@@ -360,7 +360,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
} else {
*regex = G.previous_regex_ptr;
if (!G.previous_regex_ptr)
- bb_error_msg_and_die("no previous regexp");
+ bb_simple_error_msg_and_die("no previous regexp");
}
/* Move position to next character after last delimiter */
pos += (next+1);
@@ -378,7 +378,7 @@ static int parse_file_cmd(/*sed_cmd_t *sed_cmd,*/ const char *filecmdstr, char *
start = skip_whitespace(filecmdstr);
eol = strchrnul(start, '\n');
if (eol == start)
- bb_error_msg_and_die("empty filename");
+ bb_simple_error_msg_and_die("empty filename");
if (*eol) {
/* If lines glued together, put backslash back. */
@@ -468,7 +468,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
goto out;
default:
dbg("s bad flags:'%s'", substr + idx);
- bb_error_msg_and_die("bad option in substitution expression");
+ bb_simple_error_msg_and_die("bad option in substitution expression");
}
}
out:
@@ -688,7 +688,7 @@ static void add_cmd(const char *cmdstr)
idx--; /* if 0, trigger error check below */
}
if (idx < 0)
- bb_error_msg_and_die("no address after comma");
+ bb_simple_error_msg_and_die("no address after comma");
sed_cmd->end_line_orig = sed_cmd->end_line;
}
@@ -706,7 +706,7 @@ static void add_cmd(const char *cmdstr)
/* last part (mandatory) will be a command */
if (!*cmdstr)
- bb_error_msg_and_die("missing command");
+ bb_simple_error_msg_and_die("missing command");
sed_cmd->cmd = *cmdstr++;
cmdstr = parse_cmd_args(sed_cmd, cmdstr);
@@ -791,7 +791,7 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
if (!current_regex) {
current_regex = G.previous_regex_ptr;
if (!current_regex)
- bb_error_msg_and_die("no previous regexp");
+ bb_simple_error_msg_and_die("no previous regexp");
}
G.previous_regex_ptr = current_regex;
@@ -962,7 +962,7 @@ static void puts_maybe_newline(char *s, FILE *file, char *last_puts_char, char l
if (ferror(file)) {
xfunc_error_retval = 4; /* It's what gnu sed exits with... */
- bb_error_msg_and_die(bb_msg_write_error);
+ bb_simple_error_msg_and_die(bb_msg_write_error);
}
*last_puts_char = lpc;
}
@@ -1192,7 +1192,7 @@ static void process_files(void)
}
sed_cmd = sed_cmd->next;
if (!sed_cmd)
- bb_error_msg_and_die("unterminated {");
+ bb_simple_error_msg_and_die("unterminated {");
}
}
continue;
diff --git a/editors/vi.c b/editors/vi.c
index 0ea547a75..f8fab7028 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1042,7 +1042,7 @@ static int readit(void) // read (maybe cursor) key from stdin
goto again;
go_bottom_and_clear_to_eol();
cookmode(); // terminal to "cooked"
- bb_error_msg_and_die("can't read user input");
+ bb_simple_error_msg_and_die("can't read user input");
}
return c;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-11 07:28:50 +0000