From 998fe29301083246f16738a5f42ccb9d15fd85ea Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 6 Mar 2010 13:16:19 +0100 Subject: remove: without -f, avoid unnecessary-expense/issues with euidaccess * src/remove.c (write_protected_non_symlink): If faccessat fails, return 1 or -1 directly, rather than falling back on euidaccess*. --- src/remove.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/remove.c') diff --git a/src/remove.c b/src/remove.c index b6cfc8e99..d0b2dae2f 100644 --- a/src/remove.c +++ b/src/remove.c @@ -171,9 +171,13 @@ write_protected_non_symlink (int fd_cwd, { /* This implements #1: on decent systems, either faccessat is native or /proc/self/fd allows us to skip a chdir. */ - if (!openat_needs_fchdir () - && faccessat (fd_cwd, file, W_OK, AT_EACCESS) == 0) - return 0; + if (!openat_needs_fchdir ()) + { + if (faccessat (fd_cwd, file, W_OK, AT_EACCESS) == 0) + return 0; + + return errno == EACCES ? 1 : -1; + } /* This implements #5: */ size_t file_name_len = strlen (full_name); -- cgit v1.2.3-70-g09d2