truncate: always set mode when opening file to avoid fortify errors

[oweals/busybox.git] / coreutils / rm.c

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 975f2267b1f219cfd427601b2707e0654c0b009f..d0ad81dfc785160498f907ea19c6b8dc529d73c8 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -15,6 +15,17 @@
  * Size reduction.
  */
 
+//usage:#define rm_trivial_usage
+//usage:       "[-irf] FILE..."
+//usage:#define rm_full_usage "\n\n"
+//usage:       "Remove (unlink) FILEs\n"
+//usage:     "\n       -i      Always prompt before removing"
+//usage:     "\n       -f      Never prompt"
+//usage:     "\n       -R,-r   Recurse"
+//usage:
+//usage:#define rm_example_usage
+//usage:       "$ rm -rf /tmp/foo\n"
+
 #include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
@@ -27,21 +38,23 @@ int rm_main(int argc UNUSED_PARAM, char **argv)
        unsigned opt;
 
        opt_complementary = "f-i:i-f";
-       opt = getopt32(argv, "fiRr");
+       opt = getopt32(argv, "fiRrv");
        argv += optind;
        if (opt & 1)
                flags |= FILEUTILS_FORCE;
        if (opt & 2)
                flags |= FILEUTILS_INTERACTIVE;
-       if (opt & 12)
+       if (opt & (8|4))
                flags |= FILEUTILS_RECUR;
+       if ((opt & 16) && FILEUTILS_VERBOSE)
+               flags |= FILEUTILS_VERBOSE;
 
        if (*argv != NULL) {
                do {
                        const char *base = bb_get_last_path_component_strip(*argv);
 
                        if (DOT_OR_DOTDOT(base)) {
-                               bb_error_msg("cannot remove '.' or '..'");
+                               bb_error_msg("can't remove '.' or '..'");
                        } else if (remove_file(*argv, flags) >= 0) {
                                continue;
                        }