fstools: use -Wno-format-truncation instead of -Wno-error=format-truncation

[project/fstools.git] / jffs2reset.c

diff --git a/jffs2reset.c b/jffs2reset.c
index 1080883..9a31fdd 100644 (file)
--- a/jffs2reset.c
+++ b/jffs2reset.c
@@ -14,7 +14,7 @@
 #include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
+#include <sys/reboot.h>
 #include <libubox/ulog.h>
 
 #include <fcntl.h>
@@ -23,42 +23,27 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <getopt.h>
+
 
 #include "libfstools/libfstools.h"
 #include "libfstools/volume.h"
 
+static int jffs2_mark(struct volume *v);
+
 static int
-ask_user(int argc, char **argv)
+ask_user(void)
 {
-       if ((argc < 2) || strcmp(argv[1], "-y")) {
-               ULOG_WARN("This will erase all settings and remove any installed packages. Are you sure? [N/y]\n");
-               if (getchar() != 'y')
-                       return -1;
-       }
+       ULOG_WARN("This will erase all settings and remove any installed packages. Are you sure? [N/y]\n");
+       if (getchar() != 'y')
+               return -1;
        return 0;
-
 }
 
-static int
-jffs2_reset(int argc, char **argv)
+static int jffs2_reset(struct volume *v, int reset)
 {
-       struct volume *v;
        char *mp;
 
-       if (ask_user(argc, argv))
-               return -1;
-
-       if (find_filesystem("overlay")) {
-               ULOG_ERR("overlayfs not supported by kernel\n");
-               return -1;
-       }
-
-       v = volume_find("rootfs_data");
-       if (!v) {
-               ULOG_ERR("MTD partition 'rootfs_data' not found\n");
-               return -1;
-       }
-
        mp = find_mount_point(v->blk, 1);
        if (mp) {
                ULOG_INFO("%s is mounted as %s, only erasing files\n", v->blk, mp);
@@ -66,32 +51,29 @@ jffs2_reset(int argc, char **argv)
                overlay_delete(mp, false);
                mount(mp, "/", NULL, MS_REMOUNT, 0);
        } else {
-               ULOG_INFO("%s is not mounted, erasing it\n", v->blk);
-               volume_erase_all(v);
+               ULOG_INFO("%s is not mounted\n", v->blk);
+               return jffs2_mark(v);
+       }
+
+       if (reset) {
+               sync();
+               sleep(2);
+               reboot(RB_AUTOBOOT);
+               while (1)
+                       ;
        }
 
        return 0;
 }
 
-static int
-jffs2_mark(int argc, char **argv)
+static int jffs2_mark(struct volume *v)
 {
        __u32 deadc0de = __cpu_to_be32(0xdeadc0de);
-       struct volume *v;
        size_t sz;
        int fd;
 
-       if (ask_user(argc, argv))
-               return -1;
-
-       v = volume_find("rootfs_data");
-       if (!v) {
-               ULOG_ERR("MTD partition 'rootfs_data' not found\n");
-               return -1;
-       }
-
        fd = open(v->blk, O_WRONLY);
-       ULOG_INFO("%s - marking with deadc0de\n", v->blk);
+       ULOG_INFO("%s will be erased on next mount\n", v->blk);
        if (!fd) {
                ULOG_ERR("opening %s failed\n", v->blk);
                return -1;
@@ -110,7 +92,41 @@ jffs2_mark(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
+       struct volume *v;
+       int ch, yes = 0, reset = 0;
+       while ((ch = getopt(argc, argv, "yr")) != -1) {
+               switch(ch) {
+               case 'y':
+                       yes = 1;
+                       break;
+               case 'r':
+                       reset = 1;
+                       break;
+               }
+
+       }
+
+       if (!yes && ask_user())
+               return -1;
+
+       /*
+        * TODO: Currently this only checks if kernel supports OverlayFS. We
+        * should check if there is a mount point using it with rootfs_data
+        * as upperdir.
+        */
+       if (find_filesystem("overlay")) {
+               ULOG_ERR("overlayfs not supported by kernel\n");
+               return -1;
+       }
+
+       v = volume_find("rootfs_data");
+       if (!v) {
+               ULOG_ERR("MTD partition 'rootfs_data' not found\n");
+               return -1;
+       }
+
+       volume_init(v);
        if (!strcmp(*argv, "jffs2mark"))
-               return jffs2_mark(argc, argv);
-       return jffs2_reset(argc, argv);
+               return jffs2_mark(v);
+       return jffs2_reset(v, reset);
 }