diff --git a/main/cmd/dump/dump.c b/main/cmd/dump/dump.c index d37efd9..02d2515 100644 --- a/main/cmd/dump/dump.c +++ b/main/cmd/dump/dump.c @@ -3,13 +3,12 @@ static const struct option long_opts[] = { { "dependencies", no_argument, NULL, 'd' }, - { "list-files", no_argument, NULL, 'l' }, - { "format", required_argument, NULL, 'f' }, + { "list-files", required_argument, NULL, 'l' }, { "root", required_argument, NULL, 'r' }, { NULL, 0, NULL, 0 }, }; -static const char *short_opts = "dlf:r:"; +static const char *short_opts = "dl:r:"; static int cmd_dump(int argc, char **argv) { @@ -26,13 +25,16 @@ static int cmd_dump(int argc, char **argv) break; switch (i) { - case 'f': + case 'l': + flags |= DUMP_TOC; if (strcmp(optarg, "sqfs") == 0) { format = TOC_FORMAT_SQFS; } else if (strcmp(optarg, "initrd") == 0) { format = TOC_FORMAT_INITRD; } else if (strcmp(optarg, "pkg") == 0) { format = TOC_FORMAT_PKG; + } else if (strcmp(optarg, "detail") == 0) { + format = TOC_FORMAT_PRETTY; } else { fprintf(stderr, "unknown format '%s'\n", optarg); @@ -43,9 +45,6 @@ static int cmd_dump(int argc, char **argv) case 'r': root = optarg; break; - case 'l': - flags |= DUMP_TOC; - break; case 'd': flags |= DUMP_DEPS; break; @@ -103,25 +102,25 @@ static command_t dump = { "Possible options:\n" " --dependencies, -d Show dependency information of a package.\n" "\n" -" --list-files, -l Produce a list of files. The format for the list\n" -" can be specified with --format.\n" +" --list-files, -l Produce a list of files with a specified\n" +" formating.\n" "\n" -" --format, -f Specify what format to use for printing the table\n" -" of contents. Default is a pretty printed, human\n" -" readable version.\n" +" If \"detail\" is specified, a human readable,\n" +" pretty printed format with details is used.\n" "\n" -" If \"sqfs\" is specified, a squashfs pseudo file\n" -" is genareated for setting permissions bits and\n" -" ownership appropriately.\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, a format appropriate\n" -" for Linux gen_init_cpio is produced.\n" +" If \"initrd\" is specified, the format of\n" +" Linux gen_init_cpio is produced.\n" "\n" -" --root, -r If a format is used that requires absoulute input\n" -" paths (e.g. initrd), prefix all file paths with\n" -" this. Can be used, for instance to unpack a\n" -" package to a staging directory and generate a\n" -" a listing for Linux CONFIG_INITRAMFS_SOURCE.\n", +" --root, -r If a format is used that requires absoulute\n" +" input paths (e.g. initrd), prefix all file\n" +" paths with this. Can be used, for instance to\n" +" unpack a package to a staging directory and\n" +" generate a a listing for Linux\n" +" CONFIG_INITRAMFS_SOURCE.\n", .run_cmd = cmd_dump, }; diff --git a/main/cmd/install/install.c b/main/cmd/install/install.c index f984033..39f34b7 100644 --- a/main/cmd/install/install.c +++ b/main/cmd/install/install.c @@ -8,8 +8,7 @@ static const struct option long_opts[] = { { "no-dependencies", no_argument, NULL, 'd' }, { "repo-dir", required_argument, NULL, 'R' }, { "list-packages", no_argument, NULL, 'p' }, - { "list-files", no_argument, NULL, 'l' }, - { "format", required_argument, NULL, 'F' }, + { "list-files", required_argument, NULL, 'l' }, { "no-symlinks", no_argument, NULL, 'L' }, { "no-devices", no_argument, NULL, 'D' }, { NULL, 0, NULL, 0 }, @@ -102,14 +101,14 @@ static int cmd_install(int argc, char **argv) break; case 'l': mode = INSTALL_MODE_LIST_FILES; - break; - case 'F': if (strcmp(optarg, "sqfs") == 0) { format = TOC_FORMAT_SQFS; } else if (strcmp(optarg, "initrd") == 0) { format = TOC_FORMAT_INITRD; } else if (strcmp(optarg, "pkg") == 0) { format = TOC_FORMAT_PKG; + } else if (strcmp(optarg, "detail")) { + format = TOC_FORMAT_PRETTY; } else { fprintf(stderr, "unknown format '%s'\n", optarg); @@ -213,31 +212,33 @@ static command_t install = { "packages are evaluated and also installed.\n" "\n" "Possible options:\n" -" --repo-dir, -R Specify the input repository path to fetch the\n" -" packages from.\n" -" --root, -r A root directory to unpack the package. Defaults\n" -" to the current working directory if not set.\n" -" --no-chown, -o Do not change ownership of the extracted data.\n" -" Keep the uid/gid of the user who runs the program.\n" -" --no-chmod, -m Do not change permission flags of the extarcted\n" -" data. Use 0644 for all files and 0755 for all\n" -" directories.\n" -" --no-dependencies, -d Do not resolve dependencies, only install files\n" -" packages listed on the command line.\n" -" --list-packages, -p Do not install packages, print out final package\n" -" list that would be installed.\n" -" --list-files, -l Do not install packages, print out table of\n" -" contents for all packages that would be installed.\n" -" --format, -F Specify what format to use for printing the table\n" -" of contents. Default is a pretty printed, human\n" -" readable version.\n" +" --repo-dir, -R Specify the input repository path to fetch the\n" +" packages from.\n" +" --root, -r A root directory to unpack the package. Default\n" +" if not set is the current working directory.\n" +" --no-chown, -o Do not change ownership of the extracted data.\n" +" Keep the uid/gid of the user who runs the \n" +" program." +" --no-chmod, -m Do not change permission flags of the extarcted\n" +" data. Use 0644 for all files and 0755 for all\n" +" directories.\n" +" --no-dependencies, -d Do not resolve dependencies, only install files\n" +" packages listed on the command line.\n" +" --list-packages, -p Do not install packages, print out final\n" +" package list that would be installed.\n" +" --list-files, -l Do not install packages, print out table of\n" +" contents for all packages that would be\n" +" installed in a specified format.\n" "\n" -" If \"sqfs\" is specified, a squashfs pseudo file\n" -" is genareated for setting permissions bits and\n" -" ownership appropriately.\n" +" If \"detail\" is specified, a human readable,\n" +" pretty printed format with details is used.\n" "\n" -" If \"initrd\" is specified, a format appropriate\n" -" for Linux gen_init_cpio is produced.\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, };