*: replace xopen3 with xopen where makes sense
function old new delta uniq_main 421 416 -5 sort_main 803 798 -5 patch_main 2051 2046 -5 cpio_main 547 542 -5 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
36af2f7977
commit
c05387d5de
@ -370,7 +370,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */
|
||||
bb_show_usage();
|
||||
if (opt & CPIO_OPT_FILE) {
|
||||
xmove_fd(xopen3(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO);
|
||||
xmove_fd(xopen(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
|
||||
}
|
||||
dump:
|
||||
return cpio_o();
|
||||
|
@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
|
||||
#if ENABLE_FEATURE_SORT_BIG
|
||||
/* Open output file _after_ we read all input ones */
|
||||
if (option_mask32 & FLAG_o)
|
||||
xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
|
||||
xmove_fd(xopen(str_o, O_WRONLY), STDOUT_FILENO);
|
||||
#endif
|
||||
flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
|
||||
for (i = 0; i < linecount; i++)
|
||||
|
@ -52,8 +52,8 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (output[0] != '-' || output[1]) {
|
||||
// Won't work with "uniq - FILE" and closed stdin:
|
||||
//close(STDOUT_FILENO);
|
||||
//xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666);
|
||||
xmove_fd(xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO);
|
||||
//xopen(output, O_WRONLY | O_CREAT | O_TRUNC);
|
||||
xmove_fd(xopen(output, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -591,7 +591,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
|
||||
xmkpath(name, -1);
|
||||
*s = '/';
|
||||
}
|
||||
TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666);
|
||||
TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
|
||||
} else {
|
||||
printf("patching file %s\n", name);
|
||||
TT.filein = xopen(name, O_RDONLY);
|
||||
|
@ -559,7 +559,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
|
||||
xmkpath(name, -1);
|
||||
*s = '/';
|
||||
}
|
||||
TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666);
|
||||
TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
|
||||
} else {
|
||||
printf("patching file %s\n", name);
|
||||
TT.filein = xopen(name, O_RDWR);
|
||||
|
@ -134,7 +134,7 @@ int FAST_FUNC xopen3(const char *pathname, int flags, int mode)
|
||||
return ret;
|
||||
}
|
||||
|
||||
// Die if we can't open an existing file and return a fd.
|
||||
// Die if we can't open a file and return a fd.
|
||||
int FAST_FUNC xopen(const char *pathname, int flags)
|
||||
{
|
||||
return xopen3(pathname, flags, 0666);
|
||||
|
Loading…
Reference in New Issue
Block a user