diff --git a/include/filelist/image_entry.h b/include/filelist/image_entry.h index 9fd7127..1724d95 100644 --- a/include/filelist/image_entry.h +++ b/include/filelist/image_entry.h @@ -31,7 +31,6 @@ typedef struct image_entry_t { typedef enum { TOC_FORMAT_PRETTY = 0, - TOC_FORMAT_SQFS = 1, TOC_FORMAT_INITRD = 2, TOC_FORMAT_PKG = 3, } TOC_FORMAT; diff --git a/lib/filelist/dump_toc.c b/lib/filelist/dump_toc.c index 72afebd..64b1474 100644 --- a/lib/filelist/dump_toc.c +++ b/lib/filelist/dump_toc.c @@ -55,40 +55,6 @@ fail_type: return -1; } -static int print_sqfs(image_entry_t *ent, const char *root) -{ - mode_t mode = ent->mode & (~S_IFMT); - (void)root; - - switch (ent->mode & S_IFMT) { - case S_IFCHR: - printf("%s c %o %u %u %u %u\n", ent->name, mode, - (unsigned int)ent->uid, (unsigned int)ent->gid, - major(ent->data.device.devno), - minor(ent->data.device.devno)); - break; - case S_IFBLK: - printf("%s b %o %u %u %u %u\n", ent->name, mode, - (unsigned int)ent->uid, (unsigned int)ent->gid, - major(ent->data.device.devno), - minor(ent->data.device.devno)); - break; - case S_IFLNK: - mode = 0777; - /* fall-through */ - case S_IFDIR: - case S_IFREG: - printf("%s m %o %u %u\n", ent->name, mode, - (unsigned int)ent->uid, (unsigned int)ent->gid); - break; - default: - fputs("unknown file type in table of contents\n", stderr); - return -1; - } - - return 0; -} - static int print_initrd(image_entry_t *ent, const char *root) { mode_t mode = ent->mode & (~S_IFMT); @@ -186,7 +152,6 @@ static int print_pkg(image_entry_t *ent, const char *root) static print_fun_t printers[] = { [TOC_FORMAT_PRETTY] = print_pretty, - [TOC_FORMAT_SQFS] = print_sqfs, [TOC_FORMAT_INITRD] = print_initrd, [TOC_FORMAT_PKG] = print_pkg, }; diff --git a/main/cmd/dump/dump.c b/main/cmd/dump/dump.c index 02d2515..75be2ad 100644 --- a/main/cmd/dump/dump.c +++ b/main/cmd/dump/dump.c @@ -27,9 +27,7 @@ static int cmd_dump(int argc, char **argv) switch (i) { case 'l': flags |= DUMP_TOC; - if (strcmp(optarg, "sqfs") == 0) { - format = TOC_FORMAT_SQFS; - } else if (strcmp(optarg, "initrd") == 0) { + if (strcmp(optarg, "initrd") == 0) { format = TOC_FORMAT_INITRD; } else if (strcmp(optarg, "pkg") == 0) { format = TOC_FORMAT_PKG; @@ -108,10 +106,6 @@ static command_t dump = { " If \"detail\" is specified, a human readable,\n" " pretty printed format with details is used.\n" "\n" -" If \"sqfs\" is specified, a squashfs pseudo\n" -" file is genareated for setting permissions\n" -" bits and ownership appropriately.\n" -"\n" " If \"initrd\" is specified, the format of\n" " Linux gen_init_cpio is produced.\n" "\n" diff --git a/main/cmd/install.c b/main/cmd/install.c index f04fe2c..9295e27 100644 --- a/main/cmd/install.c +++ b/main/cmd/install.c @@ -118,9 +118,7 @@ static int cmd_install(int argc, char **argv) break; case 'l': mode = INSTALL_MODE_LIST_FILES; - if (strcmp(optarg, "sqfs") == 0) { - format = TOC_FORMAT_SQFS; - } else if (strcmp(optarg, "initrd") == 0) { + if (strcmp(optarg, "initrd") == 0) { format = TOC_FORMAT_INITRD; } else if (strcmp(optarg, "pkg") == 0) { format = TOC_FORMAT_PKG; @@ -252,10 +250,6 @@ static command_t install = { " If \"detail\" is specified, a human readable,\n" " pretty printed format with details is used.\n" "\n" -" If \"sqfs\" is specified, a squashfs pseudo\n" -" file is genareated for setting permissions bits\n" -" and ownership appropriately.\n" -"\n" " If \"initrd\" is specified, the format of Linux\n" " gen_init_cpio is produced.\n", .run_cmd = cmd_install,