(is_empty_dir): Detect and diagnose readdir failures.

Always close directory handle.

1 files changed, 15 insertions, 4 deletions

diff --git a/src/remove.c b/src/remove.c
index 11df3fa54..a75694c6b 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -522,19 +522,30 @@ is_empty_dir (char const *dir)
 {
   DIR *dirp = opendir (dir);
   if (dirp == NULL)
-    return false;
+    {
+      closedir (dirp);
+      return false;
+    }
 
   while (1)
     {
-      struct dirent *dp = readdir (dirp);
+      struct dirent *dp;
       const char *f;
 
+      errno = 0;
+      dp = readdir (dirp);
       if (dp == NULL)
-	return true;
+	{
+	  closedir (dirp);
+	  return errno == 0 ? true : false;
+	}
 
       f = dp->d_name;
       if ( ! DOT_OR_DOTDOT (f))
-	return false;
+	{
+	  closedir (dirp);
+	  return false;
+	}
     }
 }