block: allow block info /dev/ubi?_?

[project/fstools.git] / libfstools / overlay.c

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index 62a99f8..cdac23e 100644 (file)
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -67,6 +67,7 @@ handle_rmdir(const char *dir)
 void
 foreachdir(const char *dir, int (*cb)(const char*))
 {
+       struct stat s = { 0 };
        char globdir[256];
        glob_t gl;
        int j;
@@ -77,9 +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++)
-                       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);
 }
 
@@ -303,6 +311,9 @@ int fs_state_set(const char *dir, enum fs_state state)
        char valstr[16];
        char *path;
 
+       if (fs_state_get(dir) == state)
+               return 0;
+
        path = alloca(strlen(dir) + 1 + sizeof("/.fs_state"));
        sprintf(path, "%s/.fs_state", dir);
        unlink(path);