find: improve usage text (Natanael Copa <natanael.copa@gmail.com>)

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 5489350e50ef3dc1d8815f30076f614a9fa21435..1883feed8d1f679af6d2ab8b3350f37781c53d3c 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -4,21 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -32,33 +18,28 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int rm_main(int argc, char **argv)
+int rm_main(int argc, char **argv);
+int rm_main(int argc, char **argv)
 {
        int status = 0;
        int flags = 0;
-       int opt;
+       unsigned opt;
 
-       while ((opt = getopt(argc, argv, "fiRr")) > 0) {
-               if ((opt == 'r') || (opt == 'R')) {
-                       flags |= FILEUTILS_RECUR;
-               } else {
-                       flags &= ~(FILEUTILS_INTERACTIVE | FILEUTILS_FORCE);
-                       if (opt == 'i') {
-                               flags |= FILEUTILS_INTERACTIVE;
-                       } else if (opt == 'f') {
+       opt_complementary = "f-i:i-f";
+       opt = getopt32(argc, argv, "fiRr");
+       if(opt & 1)
                                flags |= FILEUTILS_FORCE;
-                       } else {
-                               bb_show_usage();
-                       }
-               }
-       }
+       if(opt & 2)
+               flags |= FILEUTILS_INTERACTIVE;
+       if(opt & 12)
+               flags |= FILEUTILS_RECUR;
 
        if (*(argv += optind) != NULL) {
                do {
                        const char *base = bb_get_last_path_component(*argv);
 
                        if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
-                               bb_error_msg("cannot remove `.' or `..'");
+                               bb_error_msg("cannot remove '.' or '..'");
                        } else if (remove_file(*argv, flags) >= 0) {
                                continue;
                        }