From cad5364599eb5062d59e0c397ed638ddd61a8d5d Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Wed, 19 Mar 2003 09:13:01 +0000 Subject: Major coreutils update. --- libbb/remove_file.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'libbb/remove_file.c') diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 988b09124..65708a252 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c @@ -37,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; } @@ -46,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; @@ -58,21 +58,21 @@ 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; } @@ -90,18 +90,18 @@ extern int remove_file(const char *path, int flags) } 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; } @@ -111,13 +111,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; } -- cgit v1.2.3