From cf26ab70c11416401cd53e6a6a5fb4d5c2583246 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 27 Mar 2008 22:45:44 +0000 Subject: mdev: plug a few memory and fd leaks; simplify code a bit --- libbb/remove_file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libbb/remove_file.c') diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 3edc91dae..21878dc3b 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c @@ -82,8 +82,10 @@ int remove_file(const char *path, int flags) } /* !ISDIR */ - if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 - && !S_ISLNK(path_stat.st_mode) && isatty(0)) + 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); -- cgit v1.2.3