projects
/
project
/
fstools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: allow block info /dev/ubi?_?
[project/fstools.git]
/
libfstools
/
overlay.c
diff --git
a/libfstools/overlay.c
b/libfstools/overlay.c
index
d6c311b
..
cdac23e
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))
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);
}
cb(dir);
}
@@
-305,6
+311,9
@@
int fs_state_set(const char *dir, enum fs_state state)
char valstr[16];
char *path;
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);
path = alloca(strlen(dir) + 1 + sizeof("/.fs_state"));
sprintf(path, "%s/.fs_state", dir);
unlink(path);