From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/remove_file.c | 101 +++++++++---------------- 1 file changed, 37 insertions(+), 64 deletions(-) (limited to 'release/src/router/busybox/libbb/remove_file.c') diff --git a/release/src/router/busybox/libbb/remove_file.c b/release/src/router/busybox/libbb/remove_file.c index 3b84680c..8b14f07c 100644 --- a/release/src/router/busybox/libbb/remove_file.c +++ b/release/src/router/busybox/libbb/remove_file.c @@ -2,54 +2,26 @@ /* * Mini remove_file implementation for busybox * - * * Copyright (C) 2001 Matt Kraai * - * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * 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 - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "libbb.h" -extern 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; - int path_exists = 1; if (lstat(path, &path_stat) < 0) { if (errno != ENOENT) { - perror_msg("unable to stat `%s'", path); + bb_perror_msg("cannot stat '%s'", path); return -1; } - - path_exists = 0; - } - - 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,69 +33,70 @@ 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, + if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0)) + || (flags & FILEUTILS_INTERACTIVE) + ) { + fprintf(stderr, "%s: descend into directory '%s'? ", applet_name, path); - if (!ask_confirmation()) + if (!bb_ask_confirmation()) return 0; } - if ((dp = opendir(path)) == NULL) { - perror_msg("unable to open `%s'", path); + dp = opendir(path); + if (dp == NULL) { 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("cannot 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'? ", applet_name, path); + if (!bb_ask_confirmation()) return status; } if (rmdir(path) < 0) { - perror_msg("unable to remove `%s'", path); + bb_perror_msg("cannot remove '%s'", path); return -1; } return status; - } else { - 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); - if (!ask_confirmation()) - return 0; - } + } - if (unlink(path) < 0) { - perror_msg("unable to remove `%s'", path); - return -1; - } + /* !ISDIR */ + 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); + if (!bb_ask_confirmation()) + return 0; + } - return 0; + if (unlink(path) < 0) { + bb_perror_msg("cannot remove '%s'", path); + return -1; } + + return 0; } -- cgit v1.2.3-54-g00ecf