From 649a00e9b8d14fd96ffc64a218f913addf676f9c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 29 Aug 2002 10:42:12 +0000 Subject: [PATCH] (is_empty_dir): Detect and diagnose readdir failures. Always close directory handle. --- src/remove.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/remove.c b/src/remove.c index 11df3fa546..a75694c6b1 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; + } } } -- 2.47.2