mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
rm: be even more careful when using a replacement errno value
* src/remove.c (excise): The change in commit v8.19-107-gccbd3f3 made the "rm -rf D" (for unreadable dir, D) diagnostic worse on Solaris 10: -rm: cannot remove 'D': Permission denied +rm: cannot remove 'D': File exists That happened because unlinkat would fail with EEXIST there, given an unreadable directory, which made the two tests, tests/rm/unread2 and tests/rm/unreadable fail. Accommodate the EEXIST case, too.
This commit is contained in:
1 parent
0bb0c2c00e
commit
ba034fc449
1 file changed
+6
-4
+6
-4
@@ -393,11 +393,13 @@ excise (FTS *fts, FTSENT *ent, struct rm_options const *x, bool is_dir)
|
||||
return RM_OK;
|
||||
|
||||
/* When failing to rmdir an unreadable directory, we see errno values
|
||||
like EISDIR or ENOTDIR, but they would be meaningless in a diagnostic.
|
||||
When that happens and the errno value from the failed open is EPERM
|
||||
or EACCES, use the earlier, more descriptive errno value. */
|
||||
like EISDIR or ENOTDIR (or, on Solaris 10, EEXIST), but they would be
|
||||
meaningless in a diagnostic. When that happens and the errno value
|
||||
from the failed open is EPERM or EACCES, use the earlier, more
|
||||
descriptive errno value. */
|
||||
if (ent->fts_info == FTS_DNR
|
||||
&& (errno == ENOTEMPTY || errno == EISDIR || errno == ENOTDIR)
|
||||
&& (errno == ENOTEMPTY || errno == EISDIR || errno == ENOTDIR
|
||||
|| errno == EEXIST)
|
||||
&& (ent->fts_errno == EPERM || ent->fts_errno == EACCES))
|
||||
errno = ent->fts_errno;
|
||||
error (0, errno, _("cannot remove %s"), quote (ent->fts_path));
|
||||
|
||||
Reference in new issue
Block a user