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;
}
if (!path_exists) {
if (!(flags & FILEUTILS_FORCE)) {
- perror_msg("cannot remove `%s'", path);
+ bb_perror_msg("cannot remove `%s'", path);
return -1;
}
return 0;
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;
}
!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;
}