libfstools: make mtd_volume_identify() less chatty

[project/fstools.git] / jffs2reset.c

diff --git a/jffs2reset.c b/jffs2reset.c
index 0673982..6beb81e 100644 (file)
--- a/jffs2reset.c
+++ b/jffs2reset.c
@@ -15,6 +15,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <libubox/ulog.h>
+
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
@@ -28,25 +30,25 @@
 static int
 handle_rmdir(const char *dir)
 {
-       struct stat s;
-       struct dirent **namelist;
-       int n;
-
-       n = scandir(dir, &namelist, NULL, NULL);
+       struct dirent *dt;
+       struct stat st;
+       DIR *d;
+       int fd;
 
-       if (n < 1)
+       d = opendir(dir);
+       if (!d)
                return -1;
 
-       while (n--) {
-               char file[256];
+       fd = dirfd(d);
+
+       while ((dt = readdir(d)) != NULL) {
+               if (fstatat(fd, dt->d_name, &st, AT_SYMLINK_NOFOLLOW) || S_ISDIR(st.st_mode))
+                       continue;
 
-               snprintf(file, sizeof(file), "%s%s", dir, namelist[n]->d_name);
-               if (!lstat(file, &s) && !S_ISDIR(s.st_mode))
-                       unlink(file);
-               free(namelist[n]);
+               unlinkat(fd, dt->d_name, 0);
        }
-       free(namelist);
 
+       closedir(d);
        rmdir(dir);
 
        return 0;
@@ -56,7 +58,7 @@ static int
 ask_user(int argc, char **argv)
 {
        if ((argc < 2) || strcmp(argv[1], "-y")) {
-               fprintf(stderr, "This will erase all settings and remove any installed packages. Are you sure? [N/y]\n");
+               ULOG_WARN("This will erase all settings and remove any installed packages. Are you sure? [N/y]\n");
                if (getchar() != 'y')
                        return -1;
        }
@@ -74,23 +76,23 @@ jffs2_reset(int argc, char **argv)
                return -1;
 
        if (find_filesystem("overlay")) {
-               fprintf(stderr, "overlayfs not found\n");
+               ULOG_ERR("overlayfs not supported by kernel\n");
                return -1;
        }
 
        v = volume_find("rootfs_data");
        if (!v) {
-               fprintf(stderr, "no rootfs_data was found\n");
+               ULOG_ERR("MTD partition 'rootfs_data' not found\n");
                return -1;
        }
 
-       mp = find_mount_point(v->blk, "jffs2");
+       mp = find_mount_point(v->blk, 1);
        if (mp) {
-               fprintf(stderr, "%s is mounted as %s, only erasing files\n", v->blk, mp);
+               ULOG_INFO("%s is mounted as %s, only erasing files\n", v->blk, mp);
                foreachdir(mp, handle_rmdir);
                mount(mp, "/", NULL, MS_REMOUNT, 0);
        } else {
-               fprintf(stderr, "%s is not mounted, erasing it\n", v->blk);
+               ULOG_INFO("%s is not mounted, erasing it\n", v->blk);
                volume_erase_all(v);
        }
 
@@ -110,22 +112,22 @@ jffs2_mark(int argc, char **argv)
 
        v = volume_find("rootfs_data");
        if (!v) {
-               fprintf(stderr, "no rootfs_data was found\n");
+               ULOG_ERR("MTD partition 'rootfs_data' not found\n");
                return -1;
        }
 
        fd = open(v->blk, O_WRONLY);
-       fprintf(stderr, "%s - marking with deadc0de\n", v->blk);
+       ULOG_INFO("%s - marking with deadc0de\n", v->blk);
        if (!fd) {
-               fprintf(stderr, "opening %s failed\n", v->blk);
+               ULOG_ERR("opening %s failed\n", v->blk);
                return -1;
        }
 
        sz = write(fd, &deadc0de, sizeof(deadc0de));
        close(fd);
 
-       if (sz != 1) {
-               fprintf(stderr, "writing %s failed: %s\n", v->blk, strerror(errno));
+       if (sz != 4) {
+               ULOG_ERR("writing %s failed: %s\n", v->blk, strerror(errno));
                return -1;
        }