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

'simple' error message functions by Loic Grenie <loic.grenie@gmail.com>.

Browse Source 
263 bytes saved.
This commit is contained in:
Denis Vlasenko
2007-10-01 11:58:38 +00:00
parent d65ea39ffc
commit 0c97c9d437
50 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
findutils/find.c
View File

@@ -277,7 +277,7 @@ ACTF(exec)
rc = spawn_and_wait(argv);
if (rc < 0)
bb_perror_msg("%s", argv[0]);
bb_simple_perror_msg(argv[0]);
i = 0;
while (argv[i])
@@ -347,7 +347,7 @@ ACTF(delete)
rc = unlink(fileName);
}
if (rc < 0)
bb_perror_msg("%s", fileName);
bb_simple_perror_msg(fileName);
return TRUE;
}
#endif
@@ -780,7 +780,7 @@ static action*** parse_params(char **argv)
ap->context = NULL;
/* SELinux headers erroneously declare non-const parameter */
if (selinux_raw_to_trans_context((char*)arg1, &ap->context))
bb_perror_msg("%s", arg1);
bb_simple_perror_msg(arg1);
}
#endif
else {

4
findutils/grep.c
View File

@@ -369,7 +369,7 @@ static int file_action_grep(const char *filename, struct stat *statbuf, void* ma
FILE *file = fopen(filename, "r");
if (file == NULL) {
if (!SUPPRESS_ERR_MSGS)
bb_perror_msg("%s", cur_file);
bb_simple_perror_msg(cur_file);
open_errors = 1;
return 0;
}
@@ -517,7 +517,7 @@ int grep_main(int argc, char **argv)
file = fopen(cur_file, "r");
if (file == NULL) {
if (!SUPPRESS_ERR_MSGS)
bb_perror_msg("%s", cur_file);
bb_simple_perror_msg(cur_file);
open_errors = 1;
continue;
}

2
findutils/xargs.c
View File

@@ -57,7 +57,7 @@ static int xargs_exec(char **args)
status = spawn_and_wait(args);
if (status < 0) {
bb_perror_msg("%s", args[0]);
bb_simple_perror_msg(args[0]);
return errno == ENOENT ? 127 : 126;
}
if (status == 255) {