Dangerous assumption, especially if apr_dir_read uses readdir_r.

Be safe.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111516 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index fd5e3ab83360bd24361eace01bbfd75b9cd4cb49..d505ecb777c0ca1a8454c3c9d1e2780c6be62fd2 100644 (file)
--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
@@ -348,11 +348,9 @@ static int process_dir(char *path, apr_pool_t *pool)
     }
 
     while (apr_dir_read(&info, 0, dir) == APR_SUCCESS && !interrupted) {
-        /* skip first two entries which will always be '.' and '..' */
-        if (skip < 2) {
-            skip++;
-            continue;
-        }
+        if (!strcmp(info.name, ".") || !strcmp(info.name, "..")) {
+           continue;
+       }
         d = apr_pcalloc(p, sizeof(DIRENTRY));
         d->basename = apr_pstrcat(p, path, "/", info.name, NULL);
         APR_RING_INSERT_TAIL(&anchor, d, _direntry, link);