aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archival/cpio.c2
-rw-r--r--coreutils/sort.c2
-rw-r--r--coreutils/uniq.c4
-rw-r--r--editors/patch.c2
-rw-r--r--editors/patch_toybox.c2
-rw-r--r--libbb/xfuncs_printf.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/archival/cpio.c b/archival/cpio.c
index 7cd8ee8a7..a2d74dc79 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -370,7 +370,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
370 if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */ 370 if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */
371 bb_show_usage(); 371 bb_show_usage();
372 if (opt & CPIO_OPT_FILE) { 372 if (opt & CPIO_OPT_FILE) {
373 xmove_fd(xopen3(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO); 373 xmove_fd(xopen(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
374 } 374 }
375 dump: 375 dump:
376 return cpio_o(); 376 return cpio_o();
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 4407b7105..716824321 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
412#if ENABLE_FEATURE_SORT_BIG 412#if ENABLE_FEATURE_SORT_BIG
413 /* Open output file _after_ we read all input ones */ 413 /* Open output file _after_ we read all input ones */
414 if (option_mask32 & FLAG_o) 414 if (option_mask32 & FLAG_o)
415 xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO); 415 xmove_fd(xopen(str_o, O_WRONLY), STDOUT_FILENO);
416#endif 416#endif
417 flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; 417 flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
418 for (i = 0; i < linecount; i++) 418 for (i = 0; i < linecount; i++)
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index f0364b9a1..358de7894 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -52,8 +52,8 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
52 if (output[0] != '-' || output[1]) { 52 if (output[0] != '-' || output[1]) {
53 // Won't work with "uniq - FILE" and closed stdin: 53 // Won't work with "uniq - FILE" and closed stdin:
54 //close(STDOUT_FILENO); 54 //close(STDOUT_FILENO);
55 //xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666); 55 //xopen(output, O_WRONLY | O_CREAT | O_TRUNC);
56 xmove_fd(xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO); 56 xmove_fd(xopen(output, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
57 } 57 }
58 } 58 }
59 } 59 }
diff --git a/editors/patch.c b/editors/patch.c
index 764f0f183..66a9474fe 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -591,7 +591,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
591 xmkpath(name, -1); 591 xmkpath(name, -1);
592 *s = '/'; 592 *s = '/';
593 } 593 }
594 TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666); 594 TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
595 } else { 595 } else {
596 printf("patching file %s\n", name); 596 printf("patching file %s\n", name);
597 TT.filein = xopen(name, O_RDONLY); 597 TT.filein = xopen(name, O_RDONLY);
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c
index 04bd98eea..a60bf070f 100644
--- a/editors/patch_toybox.c
+++ b/editors/patch_toybox.c
@@ -559,7 +559,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
559 xmkpath(name, -1); 559 xmkpath(name, -1);
560 *s = '/'; 560 *s = '/';
561 } 561 }
562 TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666); 562 TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
563 } else { 563 } else {
564 printf("patching file %s\n", name); 564 printf("patching file %s\n", name);
565 TT.filein = xopen(name, O_RDWR); 565 TT.filein = xopen(name, O_RDWR);
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index c6db38d33..ba660a2db 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -134,7 +134,7 @@ int FAST_FUNC xopen3(const char *pathname, int flags, int mode)
134 return ret; 134 return ret;
135} 135}
136 136
137// Die if we can't open an existing file and return a fd. 137// Die if we can't open a file and return a fd.
138int FAST_FUNC xopen(const char *pathname, int flags) 138int FAST_FUNC xopen(const char *pathname, int flags)
139{ 139{
140 return xopen3(pathname, flags, 0666); 140 return xopen3(pathname, flags, 0666);