Update the lash shell (hopefully the last time...) so things like

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index b1cda3aed061c0fa8e3d9a3b67da0cb7f6a498b1..f1152eab37389cba7ad6f79bdb37275c124cce4f 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,33 +26,34 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
 #include <dirent.h>
 #include <errno.h>
-
-static const char *rm_usage = "rm [OPTION]... FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nRemove (unlink) the FILE(s).  You may use '--' to\n"
-       "indicate that all following arguments are non-options.\n\n"
-       "Options:\n"
-       "\t-f\t\tremove existing destinations, never prompt\n"
-       "\t-r or -R\tremove the contents of directories recursively\n"
-#endif
-       ;
-
+#include <unistd.h>
+#include <stdlib.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(fileName);
+               perror_msg("%s", fileName);
                return (FALSE);
        }
        return (TRUE);
@@ -56,8 +61,20 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 
 static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 {
+       if (recursiveFlag == FALSE) {
+               errno = EISDIR;
+               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(fileName);
+               perror_msg("%s", fileName);
                return (FALSE);
        }
        return (TRUE);
@@ -65,6 +82,7 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 
 extern int rm_main(int argc, char **argv)
 {
+       int status = EXIT_SUCCESS;
        int stopIt=FALSE;
        struct stat statbuf;
 
@@ -82,12 +100,20 @@ extern int rm_main(int argc, char **argv)
                                                break;
                                        case 'f':
                                                forceFlag = TRUE;
+#ifdef BB_FEATURE_RM_INTERACTIVE
+                                               interactiveFlag = FALSE;
+#endif
+                                               break;
+                                       case 'i':
+#ifdef BB_FEATURE_RM_INTERACTIVE
+                                               interactiveFlag = TRUE;
+#endif
                                                break;
                                        case '-':
                                                stopIt = TRUE;
                                                break;
                                        default:
-                                               usage(rm_usage);
+                                               show_usage();
                                }
                        argc--;
                        argv++;
@@ -97,7 +123,7 @@ extern int rm_main(int argc, char **argv)
        }
 
        if (argc < 1 && forceFlag == FALSE) {
-               usage(rm_usage);
+               show_usage();
        }
 
        while (argc-- > 0) {
@@ -106,11 +132,11 @@ extern int rm_main(int argc, char **argv)
                        && errno == ENOENT) {
                        /* do not reports errors for non-existent files if -f, just skip them */
                } else {
-                       if (recursiveAction(srcName, recursiveFlag, FALSE,
+                       if (recursive_action(srcName, recursiveFlag, FALSE,
                                                                TRUE, fileAction, dirAction, NULL) == FALSE) {
-                               exit(FALSE);
+                               status = EXIT_FAILURE;
                        }
                }
        }
-       exit(TRUE);
+       return status;
 }