summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/remove.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/remove.c b/src/remove.c
index 292282199..e35c1e378 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -575,12 +575,15 @@ remove_cwd_entries (const struct rm_options *x)
}
while (dirp == NULL);
- if (CLOSEDIR (dirp))
+ if (dirp)
{
- error (0, errno, "%s", full_filename ("."));
- status = RM_OK;
+ if (CLOSEDIR (dirp))
+ {
+ error (0, errno, "%s", full_filename ("."));
+ status = RM_ERROR;
+ }
+ dirp = NULL;
}
- dirp = NULL;
if (ht)
{
@@ -766,7 +769,7 @@ remove_dir (struct File_spec *fs, int need_save_cwd, const struct rm_options *x)
return RM_ERROR;
}
- return RM_OK;
+ return status;
}
/* Remove the file or directory specified by FS after checking appropriate