void
foreachdir(const char *dir, int (*cb)(const char*))
{
- char globdir[256];
+ static char *globdir = NULL;
+ static size_t globdirlen = 0;
+ struct stat s = { 0 };
+ size_t dirlen = strlen(dir);
glob_t gl;
int j;
- if (dir[strlen(dir) - 1] == '/')
- snprintf(globdir, 256, "%s*", dir);
+ if (dirlen + sizeof("/*") > globdirlen) {
+ /* Alloc extra 256 B to avoid too many reallocs */
+ size_t len = dirlen + sizeof("/*") + 256;
+ char *tmp;
+
+ tmp = realloc(globdir, len);
+ if (!tmp)
+ return;
+ globdir = tmp;
+ globdirlen = len;
+ }
+
+ if (dir[dirlen - 1] == '/')
+ sprintf(globdir, "%s*", dir);
else
- snprintf(globdir, 256, "%s/*", dir); /**/
+ sprintf(globdir, "%s/*", dir);
+ /* Include GLOB_MARK as callbacks expect a trailing slash */
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]);
+ int err;
+
+ /* Quick way of skipping files */
+ if (dir[len - 1] != '/')
+ continue;
+
+ /* lstat needs path without a trailing slash */
+ if (len > 1)
+ dir[len - 1] = '\0';
+ err = lstat(gl.gl_pathv[j], &s);
+ if (len > 1)
+ dir[len - 1] = '/';
+
+ if (!err && !S_ISLNK(s.st_mode))
+ foreachdir(gl.gl_pathv[j], cb);
+ }
cb(dir);
}
return -1;
}
- return volume_init(v);
+ return 0;
}
static int
return 0;
}
+static char *overlay_fs_name(int type)
+{
+ switch (type) {
+ case FS_EXT4:
+ return "ext4";
+ case FS_F2FS:
+ return "f2fs";
+ case FS_UBIFS:
+ return "ubifs";
+ case FS_JFFS2:
+ default:
+ return "jffs2";
+ }
+}
+
int
jffs2_switch(struct volume *v)
{
- char *mp;
- int ret = -1;
+ char *mp, *fs_name;
+ int type;
if (find_overlay_mount("overlayfs:/tmp/root"))
return -1;
if (find_filesystem("overlay")) {
ULOG_ERR("overlayfs not supported by kernel\n");
- return ret;
+ return -1;
}
+ volume_init(v);
mp = find_mount_point(v->blk, 0);
if (mp) {
ULOG_ERR("rootfs_data:%s is already mounted as %s\n", v->blk, mp);
return -1;
}
- switch (volume_identify(v)) {
+ type = volume_identify(v);
+ fs_name = overlay_fs_name(type);
+
+ switch (type) {
case FS_NONE:
ULOG_ERR("no jffs2 marker found\n");
/* fall through */
case FS_DEADCODE:
- ret = switch2jffs(v);
- if (!ret) {
- ULOG_INFO("performing overlay whiteout\n");
- umount2("/tmp/root", MNT_DETACH);
- foreachdir("/overlay/", handle_whiteout);
- }
- break;
+ if (switch2jffs(v))
+ return -1;
- case FS_JFFS2:
- ret = overlay_mount(v, "jffs2");
- if (ret)
- break;
- if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
- ULOG_ERR("switching to jffs2 failed\n");
- ret = -1;
- }
+ ULOG_INFO("performing overlay whiteout\n");
+ umount2("/tmp/root", MNT_DETACH);
+ foreachdir("/overlay/", handle_whiteout);
break;
+ case FS_EXT4:
+ case FS_F2FS:
case FS_UBIFS:
- ret = overlay_mount(v, "ubifs");
- if (ret)
- break;
+ if (overlay_mount(v, fs_name))
+ return -1;
if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
- ULOG_ERR("switching to ubifs failed\n");
- ret = -1;
+ ULOG_ERR("switching to %s failed\n", fs_name);
+ return -1;
}
break;
}
- if (ret)
- return ret;
-
sync();
fs_state_set("/overlay", FS_STATE_READY);
return 0;
static int overlay_mount_fs(struct volume *v)
{
- char *fstype;
+ char *fstype = overlay_fs_name(volume_identify(v));
if (mkdir("/tmp/overlay", 0755)) {
ULOG_ERR("failed to mkdir /tmp/overlay: %s\n", strerror(errno));
return -1;
}
- fstype = "jffs2";
-
- switch (volume_identify(v)) {
- case FS_UBIFS:
- fstype = "ubifs";
- break;
- }
-
- volume_init(v);
-
if (mount(v->blk, "/tmp/overlay", fstype, MS_NOATIME, NULL)) {
ULOG_ERR("failed to mount -t %s %s /tmp/overlay: %s\n",
fstype, v->blk, strerror(errno));
return -1;
}
- return -1;
+ return 0;
}
enum fs_state fs_state_get(const char *dir)
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);
int mount_overlay(struct volume *v)
{
- char *mp;
+ char *mp, *fs_name;
if (!v)
return -1;
break;
}
- ULOG_INFO("switching to jffs2 overlay\n");
+ fs_name = overlay_fs_name(volume_identify(v));
+ ULOG_INFO("switching to %s overlay\n", fs_name);
if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
- ULOG_ERR("switching to jffs2 failed - fallback to ramoverlay\n");
+ ULOG_ERR("switching to %s failed - fallback to ramoverlay\n", fs_name);
return ramoverlay();
}
projects / project / fstools.git / blobdiff