c05387d5d
Denys Vlasenko
2010-10-18
Subject
*: replace xopen3 with xopen where makes sense
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/cpio.c +1 -1coreutils/sort.c +1 -1coreutils/uniq.c +2 -2editors/patch.c +1 -1editors/patch_toybox.c +1 -1libbb/xfuncs_printf.c +1 -1
archival/cpio.c+1 -1
| @@ -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(); | |
coreutils/sort.c+1 -1
| @@ -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++) | |
coreutils/uniq.c+2 -2
| @@ -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); |
| } | |
| } | |
| } | |
editors/patch.c+1 -1
| @@ -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); | |
editors/patch_toybox.c+1 -1
| @@ -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); | |
libbb/xfuncs_printf.c+1 -1
| @@ -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); | |