ash: code shrink around varvalue

[oweals/busybox.git] / libbb / remove_file.c

diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 3aaaef8c7f0210f594e5630723b70c9a059ec64c..eaca293d99dc061b2e628a18184921ce498f464a 100644 (file)
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -4,22 +4,24 @@
  *
  * 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.
  */
 
 #include "libbb.h"
 
-int remove_file(const char *path, int flags)
+/* Used from NOFORK applets. Must not allocate anything */
+
+int FAST_FUNC remove_file(const char *path, int flags)
 {
        struct stat path_stat;
 
        if (lstat(path, &path_stat) < 0) {
                if (errno != ENOENT) {
-                       bb_perror_msg("cannot stat '%s'", path);
+                       bb_perror_msg("can't stat '%s'", path);
                        return -1;
                }
                if (!(flags & FILEUTILS_FORCE)) {
-                       bb_perror_msg("cannot remove '%s'", path);
+                       bb_perror_msg("can't remove '%s'", path);
                        return -1;
                }
                return 0;
@@ -31,7 +33,7 @@ int remove_file(const char *path, int flags)
                int status = 0;
 
                if (!(flags & FILEUTILS_RECUR)) {
-                       bb_error_msg("%s: is a directory", path);
+                       bb_error_msg("'%s' is a directory", path);
                        return -1;
                }
 
@@ -61,7 +63,7 @@ int remove_file(const char *path, int flags)
                }
 
                if (closedir(dp) < 0) {
-                       bb_perror_msg("cannot close '%s'", path);
+                       bb_perror_msg("can't close '%s'", path);
                        return -1;
                }
 
@@ -72,16 +74,22 @@ int remove_file(const char *path, int flags)
                }
 
                if (rmdir(path) < 0) {
-                       bb_perror_msg("cannot remove '%s'", path);
+                       bb_perror_msg("can't remove '%s'", path);
                        return -1;
                }
 
+               if (flags & FILEUTILS_VERBOSE) {
+                       printf("removed directory: '%s'\n", path);
+               }
+
                return status;
        }
 
        /* !ISDIR */
-       if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0
-                       && !S_ISLNK(path_stat.st_mode) && isatty(0))
+       if ((!(flags & FILEUTILS_FORCE)
+            && access(path, W_OK) < 0
+            && !S_ISLNK(path_stat.st_mode)
+            && isatty(0))
         || (flags & FILEUTILS_INTERACTIVE)
        ) {
                fprintf(stderr, "%s: remove '%s'? ", applet_name, path);
@@ -90,9 +98,13 @@ int remove_file(const char *path, int flags)
        }
 
        if (unlink(path) < 0) {
-               bb_perror_msg("cannot remove '%s'", path);
+               bb_perror_msg("can't remove '%s'", path);
                return -1;
        }
 
+       if (flags & FILEUTILS_VERBOSE) {
+               printf("removed '%s'\n", path);
+       }
+
        return 0;
 }