overlay: use lstat rather than stat and make sure there are no trailing spaces

with this patch even uclibc wont deleted symlinked folders

Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index d6c311bd2b41fc5cb8429aae680de858e9a04470..7f696061fa6792405af5366e33d120ac73422c5d 100644 (file)
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -78,10 +78,16 @@ foreachdir(const char *dir, int (*cb)(const char*))
                snprintf(globdir, 256, "%s/*", dir); /**/
 
        if (!glob(globdir, GLOB_NOESCAPE | GLOB_MARK | GLOB_ONLYDIR, NULL, &gl))
-               for (j = 0; j < gl.gl_pathc; j++)
-                       if (!stat(gl.gl_pathv[j], &s) && !S_ISLNK(s.st_mode))
-                               foreachdir(gl.gl_pathv[j], cb);
+               for (j = 0; j < gl.gl_pathc; j++) {
+                       char *dir = gl.gl_pathv[j];
+                       int len = strlen(gl.gl_pathv[j]);
+
+                       if (len > 1 && dir[len - 1] == '/')
+                               dir[len - 1] = '\0';
 
+                       if (!lstat(gl.gl_pathv[j], &s) && !S_ISLNK(s.st_mode))
+                               foreachdir(gl.gl_pathv[j], cb);
+       }
        cb(dir);
 }