*
* 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 <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
#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;
- int path_exists = 1;
if (lstat(path, &path_stat) < 0) {
if (errno != ENOENT) {
- bb_perror_msg("unable to stat `%s'", path);
+ bb_perror_msg("can't stat '%s'", path);
return -1;
}
-
- path_exists = 0;
- }
-
- if (!path_exists) {
if (!(flags & FILEUTILS_FORCE)) {
- bb_perror_msg("cannot remove `%s'", path);
+ bb_perror_msg("can't remove '%s'", path);
return -1;
}
return 0;
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;
}
- if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 &&
- isatty(0)) ||
- (flags & FILEUTILS_INTERACTIVE)) {
- fprintf(stderr, "%s: descend into directory `%s'? ", bb_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 (!bb_ask_confirmation())
return 0;
}
- if ((dp = bb_opendir(path)) == NULL) {
+ dp = opendir(path);
+ if (dp == NULL) {
return -1;
}
char *new_path;
new_path = concat_subpath_file(path, d->d_name);
- if(new_path == NULL)
+ if (new_path == NULL)
continue;
if (remove_file(new_path, flags) < 0)
status = -1;
}
if (closedir(dp) < 0) {
- bb_perror_msg("unable to close `%s'", path);
+ bb_perror_msg("can't close '%s'", path);
return -1;
}
if (flags & FILEUTILS_INTERACTIVE) {
- fprintf(stderr, "%s: remove directory `%s'? ", bb_applet_name, path);
+ fprintf(stderr, "%s: remove directory '%s'? ", applet_name, path);
if (!bb_ask_confirmation())
return status;
}
if (rmdir(path) < 0) {
- bb_perror_msg("unable to remove `%s'", path);
+ bb_perror_msg("can't 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'? ", bb_applet_name, path);
- if (!bb_ask_confirmation())
- return 0;
- }
+ }
- if (unlink(path) < 0) {
- bb_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("can't remove '%s'", path);
+ return -1;
}
+
+ return 0;
}