- add llist_free_one() and llist_free() to libbb; Add a bit of documentation.

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

diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 3b84680c4d03647903bf83d24fd186ca5940ce5c..8b45c58b85e2b3fca63e8738623753932111b388 100644 (file)
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -2,10 +2,8 @@
 /*
  * Mini remove_file implementation for busybox
  *
- *
  * 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
@@ -19,7 +17,6 @@
  * 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
- *
  */
 
 #include <stdio.h>
@@ -40,7 +37,7 @@ extern int remove_file(const char *path, int flags)
 
        if (lstat(path, &path_stat) < 0) {
                if (errno != ENOENT) {
-                       perror_msg("unable to stat `%s'", path);
+                       bb_perror_msg("unable to stat `%s'", path);
                        return -1;
                }
 
@@ -49,7 +46,7 @@ extern int remove_file(const char *path, int flags)
 
        if (!path_exists) {
                if (!(flags & FILEUTILS_FORCE)) {
-                       perror_msg("cannot remove `%s'", path);
+                       bb_perror_msg("cannot remove `%s'", path);
                        return -1;
                }
                return 0;
@@ -61,50 +58,48 @@ extern int remove_file(const char *path, int flags)
                int status = 0;
 
                if (!(flags & FILEUTILS_RECUR)) {
-                       error_msg("%s: is a directory", path);
+                       bb_error_msg("%s: is a directory", path);
                        return -1;
                }
 
                if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 &&
                                        isatty(0)) ||
                                (flags & FILEUTILS_INTERACTIVE)) {
-                       fprintf(stderr, "%s: descend into directory `%s'? ", applet_name,
+                       fprintf(stderr, "%s: descend into directory `%s'? ", bb_applet_name,
                                        path);
-                       if (!ask_confirmation())
+                       if (!bb_ask_confirmation())
                                return 0;
                }
 
                if ((dp = opendir(path)) == NULL) {
-                       perror_msg("unable to open `%s'", path);
+                       bb_perror_msg("unable to open `%s'", path);
                        return -1;
                }
 
                while ((d = readdir(dp)) != NULL) {
                        char *new_path;
 
-                       if (strcmp(d->d_name, ".") == 0 ||
-                                       strcmp(d->d_name, "..") == 0)
+                       new_path = concat_subpath_file(path, d->d_name);
+                       if(new_path == NULL)
                                continue;
-
-                       new_path = concat_path_file(path, d->d_name);
                        if (remove_file(new_path, flags) < 0)
                                status = -1;
                        free(new_path);
                }
 
                if (closedir(dp) < 0) {
-                       perror_msg("unable to close `%s'", path);
+                       bb_perror_msg("unable to close `%s'", path);
                        return -1;
                }
 
                if (flags & FILEUTILS_INTERACTIVE) {
-                       fprintf(stderr, "%s: remove directory `%s'? ", applet_name, path);
-                       if (!ask_confirmation())
+                       fprintf(stderr, "%s: remove directory `%s'? ", bb_applet_name, path);
+                       if (!bb_ask_confirmation())
                                return status;
                }
 
                if (rmdir(path) < 0) {
-                       perror_msg("unable to remove `%s'", path);
+                       bb_perror_msg("unable to remove `%s'", path);
                        return -1;
                }
 
@@ -114,13 +109,13 @@ extern int remove_file(const char *path, int flags)
                                        !S_ISLNK(path_stat.st_mode) &&
                                        isatty(0)) ||
                                (flags & FILEUTILS_INTERACTIVE)) {
-                       fprintf(stderr, "%s: remove `%s'? ", applet_name, path);
-                       if (!ask_confirmation())
+                       fprintf(stderr, "%s: remove `%s'? ", bb_applet_name, path);
+                       if (!bb_ask_confirmation())
                                return 0;
                }
 
                if (unlink(path) < 0) {
-                       perror_msg("unable to remove `%s'", path);
+                       bb_perror_msg("unable to remove `%s'", path);
                        return -1;
                }