Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This fixes the "weird file" error; it's not portable (same as before), though.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24541 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-03-23 22:56:34 +00:00
parent 5fd6637b4d
commit 409d26f976
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/coreutils/src/remove.c
View File

@ -782,7 +782,7 @@ write_protected_non_symlink (int fd_cwd,
if (euidaccess (full_filename (file), W_OK) == 0)
return 0;
if (errno == EACCES)
return -1;
return 1;
/* Perhaps some other process has removed the file, or perhaps this
is a buggy NFS client. */
@ -828,7 +828,7 @@ prompt (int fd_cwd, Dirstack_state const *ds, char const *filename,
write_protected = errno;
}
if (write_protected <= 0)
if (write_protected >= 0)
{
/* Using permissions doesn't make sense for symlinks. */
if (S_ISLNK (sbuf->st_mode) && x->interactive != RMI_ALWAYS)
@ -838,7 +838,7 @@ prompt (int fd_cwd, Dirstack_state const *ds, char const *filename,
write_protected = EISDIR;
}
if (0 < write_protected)
if (write_protected < 0)
{
error (0, write_protected, _("cannot remove %s"), quoted_name);
return RM_ERROR;