From: Jo-Philipp Wich Date: Wed, 25 Feb 2015 21:42:17 +0000 (+0100) Subject: libfstools: remove dead source file X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=commitdiff_plain;h=df71bb9b3120f6f023214b69ac9f95100ab09a62 libfstools: remove dead source file Signed-off-by: Jo-Philipp Wich --- diff --git a/libfstools/jffs2.c b/libfstools/jffs2.c deleted file mode 100644 index 1b8e1d9..0000000 --- a/libfstools/jffs2.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (C) 2014 John Crispin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 2.1 - * as published by the Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "libfstools.h" -#include "volume.h" - -#define SWITCH_JFFS2 "/tmp/.switch_jffs2" - -void -foreachdir(const char *dir, int (*cb)(const char*)) -{ - char globdir[256]; - glob_t gl; - int j; - - if (dir[strlen(dir) - 1] == '/') - snprintf(globdir, 256, "%s*", dir); - else - 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); - - cb(dir); -} - -static int -jffs2_mount(struct volume *v) -{ - if (mkdir("/tmp/overlay", 0755)) { - fprintf(stderr, "failed to mkdir /tmp/overlay: %s\n", strerror(errno)); - return -1; - } - - if (mount(v->blk, "/tmp/overlay", "jffs2", MS_NOATIME, NULL)) { - fprintf(stderr, "failed to mount -t jffs2 %s /tmp/overlay: %s\n", v->blk, strerror(errno)); - return -1; - } - - return volume_init(v); -} - -static int -switch2jffs(struct volume *v) -{ - struct stat s; - int ret; - - if (!stat(SWITCH_JFFS2, &s)) { - fprintf(stderr, "jffs2 switch already running\n"); - return -1; - } - - creat("/tmp/.switch_jffs2", 0600); - ret = mount(v->blk, "/rom/overlay", "jffs2", MS_NOATIME, NULL); - unlink("/tmp/.switch_jffs2"); - if (ret) { - fprintf(stderr, "failed - mount -t jffs2 %s /rom/overlay: %s\n", v->blk, strerror(errno)); - return -1; - } - - if (mount("none", "/", NULL, MS_NOATIME | MS_REMOUNT, 0)) { - fprintf(stderr, "failed - mount -o remount,ro none: %s\n", strerror(errno)); - return -1; - } - - system("cp -a /tmp/root/* /rom/overlay"); - - if (pivot("/rom", "/mnt")) { - fprintf(stderr, "failed - pivot /rom /mnt: %s\n", strerror(errno)); - return -1; - } - - if (mount_move("/mnt", "/tmp/root", "")) { - fprintf(stderr, "failed - mount -o move /mnt /tmp/root %s\n", strerror(errno)); - return -1; - } - - return fopivot("/overlay", "/rom"); -} - -int -handle_whiteout(const char *dir) -{ - struct stat s; - char link[256]; - ssize_t sz; - struct dirent **namelist; - int n; - - n = scandir(dir, &namelist, NULL, NULL); - - if (n < 1) - return -1; - - while (n--) { - char file[256]; - - snprintf(file, sizeof(file), "%s%s", dir, namelist[n]->d_name); - if (!lstat(file, &s) && S_ISLNK(s.st_mode)) { - sz = readlink(file, link, sizeof(link) - 1); - if (sz > 0) { - char *orig; - - link[sz] = '\0'; - orig = strstr(&file[1], "/"); - if (orig && !strcmp(link, "(overlay-whiteout)")) - unlink(orig); - } - } - free(namelist[n]); - } - free(namelist); - - return 0; -} - -int -jffs2_switch(struct volume *v) -{ - char *mp; - int ret = -1; - - if (find_mount_overlay("overlayfs:/tmp/root")) - return -1; - - if (find_filesystem("overlay")) { - fprintf(stderr, "overlayfs not found\n"); - return ret; - } - - mp = find_mount_point(v->blk, 0); - if (mp) { - fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp); - return -1; - } - - switch (volume_identify(v)) { - case FS_NONE: - fprintf(stderr, "no jffs2 marker found\n"); - /* fall through */ - - case FS_DEADCODE: - ret = switch2jffs(v); - if (!ret) { - fprintf(stderr, "doing fo cleanup\n"); - umount2("/tmp/root", MNT_DETACH); - foreachdir("/overlay/", handle_whiteout); - } - break; - - case FS_JFFS2: - ret = jffs2_mount(v); - if (ret) - break; - if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) { - fprintf(stderr, "switching to jffs2 failed\n"); - ret = -1; - } - break; - } - - return ret; -} - -static int mount_overlay_fs(struct volume *v) -{ - if (mkdir("/tmp/overlay", 0755)) { - fprintf(stderr, "failed to mkdir /tmp/overlay: %s\n", strerror(errno)); - return -1; - } - - if (mount(v->blk, "/tmp/overlay", "jffs2", MS_NOATIME, NULL)) { - fprintf(stderr, "failed to mount -t jffs2 %s /tmp/overlay: %s\n", - v->blk, strerror(errno)); - return -1; - } - - volume_init(v); - - return -1; -} - -int mount_overlay(struct volume *v) -{ - char *mp; - - mp = find_mount_point(v->blk, 0); - if (mp) { - fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp); - return -1; - } - - mount_overlay_fs(v); - - extroot_prefix = "/tmp/overlay"; - if (!mount_extroot()) { - fprintf(stderr, "fs-state: switched to extroot\n"); - return 0; - } - - fprintf(stderr, "switching to jffs2\n"); - if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) { - fprintf(stderr, "switching to jffs2 failed - fallback to ramoverlay\n"); - return ramoverlay(); - } - - return -1; -}