emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove_file: cosmetic code improvement, a few bytes saved

Browse Source
This commit is contained in:
Denis Vlasenko 2007-03-26 23:14:38 +00:00
parent 3983bd5593
commit f4d40c87d3
1 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libbb/remove_file.c
View File

@ -7,32 +7,17 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#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" #include "libbb.h"
int remove_file(const char *path, int flags) int remove_file(const char *path, int flags)
{ {
struct stat path_stat; struct stat path_stat;
int path_exists = 1;
if (lstat(path, &path_stat) < 0) { if (lstat(path, &path_stat) < 0) {
if (errno != ENOENT) { if (errno != ENOENT) {
bb_perror_msg("cannot stat '%s'", path); bb_perror_msg("cannot stat '%s'", path);
return -1; return -1;
} }
path_exists = 0;
}
if (!path_exists) {
if (!(flags & FILEUTILS_FORCE)) { if (!(flags & FILEUTILS_FORCE)) {
bb_perror_msg("cannot remove '%s'", path); bb_perror_msg("cannot remove '%s'", path);
return -1; return -1;
@ -50,16 +35,17 @@ int remove_file(const char *path, int flags)
return -1; return -1;
} }
if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0))
isatty(0)) || || (flags & FILEUTILS_INTERACTIVE)
(flags & FILEUTILS_INTERACTIVE)) { ) {
fprintf(stderr, "%s: descend into directory '%s'? ", applet_name, fprintf(stderr, "%s: descend into directory '%s'? ", applet_name,
path); path);
if (!bb_ask_confirmation()) if (!bb_ask_confirmation())
return 0; return 0;
} }
if ((dp = opendir(path)) == NULL) { dp = opendir(path);
if (dp == NULL) {
return -1; return -1;
} }
@ -91,11 +77,13 @@ int remove_file(const char *path, int flags)
} }
return status; return status;
} else { }
if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 &&
!S_ISLNK(path_stat.st_mode) && /* !ISDIR */
isatty(0)) || if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0
(flags & FILEUTILS_INTERACTIVE)) { && !S_ISLNK(path_stat.st_mode) && isatty(0))
|| (flags & FILEUTILS_INTERACTIVE)
) {
fprintf(stderr, "%s: remove '%s'? ", applet_name, path); fprintf(stderr, "%s: remove '%s'? ", applet_name, path);
if (!bb_ask_confirmation()) if (!bb_ask_confirmation())
return 0; return 0;
@ -108,4 +96,3 @@ int remove_file(const char *path, int flags)
return 0; return 0;
} }
}