Split up chmod_chown_chgrp.c into 3 separate apps. This unfortunately

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index 302599ec07dff3c7f47aa7884c36fb155ca6d0ba..ea7f86ce100bfe7309a4b954e997cb480e936011 100644 (file)
--- a/rm.c
+++ b/rm.c
@@ -3,9 +3,13 @@
  * Mini rm implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
+ * INTERACTIVE feature Copyright (C) 2001 by Alcove
+ *   written by Christophe Boyanique <Christophe.Boyanique@fr.alcove.com>
+ *   for Ipanema Technologies
+ *
  * 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
@@ -22,7 +26,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
@@ -30,14 +33,26 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <getopt.h>
+#include "busybox.h"
 
 static int recursiveFlag = FALSE;
 static int forceFlag = FALSE;
+#ifdef BB_FEATURE_RM_INTERACTIVE
+       static int interactiveFlag = FALSE;
+#endif
 static const char *srcName;
 
 
 static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
+#ifdef BB_FEATURE_RM_INTERACTIVE
+       if (interactiveFlag == TRUE) {
+               printf("rm: remove `%s'? ", fileName);
+               if (ask_confirmation() == 0)
+                       return (TRUE);
+       }
+#endif
        if (unlink(fileName) < 0) {
                perror_msg("%s", fileName);
                return (FALSE);
@@ -52,6 +67,13 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
                perror_msg("%s", fileName);
                return (FALSE);
        } 
+#ifdef BB_FEATURE_RM_INTERACTIVE
+       if (interactiveFlag == TRUE) {
+               printf("rm: remove directory `%s'? ", fileName);
+               if (ask_confirmation() == 0)
+                       return (TRUE);
+       }
+#endif
        if (rmdir(fileName) < 0) {
                perror_msg("%s", fileName);
                return (FALSE);
@@ -61,44 +83,46 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 
 extern int rm_main(int argc, char **argv)
 {
+       int opt;
        int status = EXIT_SUCCESS;
-       int stopIt=FALSE;
        struct stat statbuf;
+       
+       
+       /* do normal option parsing */
+       while ((opt = getopt(argc, argv, "Rrf-"
+#ifdef BB_FEATURE_RM_INTERACTIVE
+"i"
+#endif
+)) > 0) {
+               switch (opt) {
+                       case 'R':
+                       case 'r':
+                               recursiveFlag = TRUE;
+                               break;
+                       case 'f':
+                               forceFlag = TRUE;
+#ifdef BB_FEATURE_RM_INTERACTIVE
 
-       argc--;
-       argv++;
-
-       /* Parse any options */
-       while (argc > 0 && stopIt == FALSE) {
-               if (**argv == '-') {
-                       while (*++(*argv))
-                               switch (**argv) {
-                                       case 'R':
-                                       case 'r':
-                                               recursiveFlag = TRUE;
-                                               break;
-                                       case 'f':
-                                               forceFlag = TRUE;
-                                               break;
-                                       case '-':
-                                               stopIt = TRUE;
-                                               break;
-                                       default:
-                                               usage(rm_usage);
-                               }
-                       argc--;
-                       argv++;
+                               interactiveFlag = FALSE;
+#endif
+                               break;
+#ifdef BB_FEATURE_RM_INTERACTIVE
+                       case 'i':
+                               interactiveFlag = TRUE;
+                               forceFlag = FALSE;
+                               break;
+#endif
+                       default:
+                               show_usage();
                }
-               else
-                       break;
        }
-
-       if (argc < 1 && forceFlag == FALSE) {
-               usage(rm_usage);
+       
+       if (argc == optind && forceFlag == FALSE) {
+               show_usage();
        }
 
-       while (argc-- > 0) {
-               srcName = *(argv++);
+       while (optind < argc) {
+               srcName = argv[optind];
                if (forceFlag == TRUE && lstat(srcName, &statbuf) != 0
                        && errno == ENOENT) {
                        /* do not reports errors for non-existent files if -f, just skip them */
@@ -108,6 +132,7 @@ extern int rm_main(int argc, char **argv)
                                status = EXIT_FAILURE;
                        }
                }
+               optind++;
        }
        return status;
 }