Fix misspelling of `stabilize'.

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index 477d3af598bfe09d012ec606b49e80101b234fbe..51c9f4ceb5363f71919be999637198bc8a8b5771 100644 (file)
--- a/rm.c
+++ b/rm.c
@@ -1,7 +1,10 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini rm implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * 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
@@ -19,75 +22,56 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
 #include <dirent.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include "busybox.h"
 
-static const char* rm_usage = "Usage: rm [OPTION]... FILE...\n"
-"Remove (unlink) the FILE(s).\n\n"
-"\t-f\tremove existing destinations, never prompt\n"
-"\t-r\tremove the contents of directories recursively\n";
-
-
-static int recursiveFlag = FALSE;
-static int forceFlag = FALSE;
-static const char *srcName;
-
-
-static int fileAction(const char *fileName, struct stat* statbuf)
+extern int rm_main(int argc, char **argv)
 {
-    if (unlink( fileName) < 0 ) {
-       perror( fileName);
-       return ( FALSE);
-    }
-    return ( TRUE);
-}
+       int status = 0;
+       int opt;
+       int flags = 0;
+       int i;
 
-static int dirAction(const char *fileName, struct stat* statbuf)
-{
-    if (rmdir( fileName) < 0 ) {
-       perror( fileName);
-       return ( FALSE);
-    }
-    return ( TRUE);
-}
+       while ((opt = getopt(argc, argv, "fiRr")) != -1) {
+               switch (opt) {
+               case 'f':
+                       flags &= ~FILEUTILS_INTERACTIVE;
+                       flags |= FILEUTILS_FORCE;
+                       break;
+               case 'i':
+                       flags &= ~FILEUTILS_FORCE;
+                       flags |= FILEUTILS_INTERACTIVE;
+                       break;
+               case 'R':
+               case 'r':
+                       flags |= FILEUTILS_RECUR;
+                       break;
+               }
+       }
 
-extern int rm_main(int argc, char **argv)
-{
+       if (!(flags & FILEUTILS_FORCE) && optind == argc)
+               show_usage();
 
-    if (argc < 2) {
-       fprintf(stderr, "Usage: %s", rm_usage);
-       exit (FALSE);
-    }
-    argc--;
-    argv++;
+       for (i = optind; i < argc; i++) {
+               char *base = get_last_path_component(argv[i]);
 
-    /* Parse any options */
-    while (**argv == '-') {
-       while (*++(*argv))
-           switch (**argv) {
-           case 'r':
-               recursiveFlag = TRUE;
-               break;
-           case 'f':
-               forceFlag = TRUE;
-               break;
-           default:
-               fprintf(stderr, "Usage: %s\n", rm_usage);
-               exit(FALSE);
-           }
-       argc--;
-       argv++;
-    }
+               if (strcmp(base, ".") == 0 || strcmp(base, "..") == 0) {
+                       error_msg("cannot remove `.' or `..'");
+                       status = 1;
+                       continue;
+               }
 
-    while (argc-- > 0) {
-       srcName = *(argv++);
-       if (recursiveAction( srcName, recursiveFlag, TRUE, TRUE, 
-                              fileAction, dirAction) == FALSE) {
-           exit( FALSE);
+               if (remove_file(argv[i], flags) < 0)
+                       status = 1;
        }
-    }
-    exit( TRUE);
+
+       return status;
 }