emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dpkg-deb: shorten code, improve help text

Browse Source 
function                                             old     new   delta
packed_usage                                       30261   30236     -25
dpkg_deb_main                                        437     401     -36
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-61)             Total: -61 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2016-11-27 04:48:53 +01:00
parent 6747bdac88
commit 351ab8278e
1 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
archival/dpkg_deb.c
View File

@@ -22,14 +22,14 @@
//kbuild:lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o //kbuild:lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o
//usage:#define dpkg_deb_trivial_usage //usage:#define dpkg_deb_trivial_usage
//usage: "[-cefxX] FILE [argument]" //usage: "[-cefxX] FILE [DIR]"
//usage:#define dpkg_deb_full_usage "\n\n" //usage:#define dpkg_deb_full_usage "\n\n"
//usage: "Perform actions on Debian packages (.debs)\n" //usage: "Perform actions on Debian packages (.deb)\n"
//usage: "\n -c List contents of filesystem tree" //usage: "\n -c List files"
//usage: "\n -e Extract control files to [argument] directory" //usage: "\n -f Print control fields"
//usage: "\n -f Display control field name starting with [argument]" //usage: "\n -e Extract control files to DIR (default: ./DEBIAN)"
//usage: "\n -x Extract packages filesystem tree to directory" //usage: "\n -x Extract files to DIR (no default)"
//usage: "\n -X Verbose extract" //usage: "\n -X Verbose -x"
//usage: //usage:
//usage:#define dpkg_deb_example_usage //usage:#define dpkg_deb_example_usage
//usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n" //usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
@@ -40,18 +40,17 @@
#define DPKG_DEB_OPT_CONTENTS 1 #define DPKG_DEB_OPT_CONTENTS 1
#define DPKG_DEB_OPT_CONTROL 2 #define DPKG_DEB_OPT_CONTROL 2
#define DPKG_DEB_OPT_FIELD 4 #define DPKG_DEB_OPT_FIELD 4
#define DPKG_DEB_OPT_EXTRACT 8 #define DPKG_DEB_OPT_EXTRACT_VERBOSE 8
#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16 #define DPKG_DEB_OPT_EXTRACT 16
int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int dpkg_deb_main(int argc, char **argv) int dpkg_deb_main(int argc UNUSED_PARAM, char **argv)
{ {
archive_handle_t *ar_archive; archive_handle_t *ar_archive;
archive_handle_t *tar_archive; archive_handle_t *tar_archive;
llist_t *control_tar_llist = NULL; llist_t *control_tar_llist = NULL;
unsigned opt; unsigned opt;
const char *extract_dir; const char *extract_dir;
int need_args;
/* Setup the tar archive handle */ /* Setup the tar archive handle */
tar_archive = init_handle(); tar_archive = init_handle();
@@ -80,53 +79,45 @@ int dpkg_deb_main(int argc, char **argv)
llist_add_to(&control_tar_llist, (char*)"control.tar.xz"); llist_add_to(&control_tar_llist, (char*)"control.tar.xz");
#endif #endif
opt_complementary = "c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"; /* Must have 1 or 2 args */
opt_complementary = "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
opt = getopt32(argv, "cefXx"); opt = getopt32(argv, "cefXx");
argv += optind; argv += optind;
argc -= optind; //argc -= optind;
if (opt & DPKG_DEB_OPT_CONTENTS) { extract_dir = argv[1];
if (opt & DPKG_DEB_OPT_CONTENTS) { // -c
tar_archive->action_header = header_verbose_list; tar_archive->action_header = header_verbose_list;
if (extract_dir)
bb_show_usage();
} }
extract_dir = NULL; if (opt & DPKG_DEB_OPT_FIELD) { // -f
need_args = 1; /* Print the entire control file */
if (opt & DPKG_DEB_OPT_CONTROL) { //TODO: standard tool accepts an optional list of fields to print
ar_archive->accept = control_tar_llist;
tar_archive->action_data = data_extract_all;
if (1 == argc) {
extract_dir = "./DEBIAN";
} else {
need_args++;
}
}
if (opt & DPKG_DEB_OPT_FIELD) {
/* Print the entire control file
* it should accept a second argument which specifies a
* specific field to print */
ar_archive->accept = control_tar_llist; ar_archive->accept = control_tar_llist;
llist_add_to(&(tar_archive->accept), (char*)"./control"); llist_add_to(&(tar_archive->accept), (char*)"./control");
tar_archive->filter = filter_accept_list; tar_archive->filter = filter_accept_list;
tar_archive->action_data = data_extract_to_stdout; tar_archive->action_data = data_extract_to_stdout;
if (extract_dir)
bb_show_usage();
} }
if (opt & DPKG_DEB_OPT_EXTRACT) { if (opt & DPKG_DEB_OPT_CONTROL) { // -e
tar_archive->action_header = header_list; ar_archive->accept = control_tar_llist;
}
if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) {
tar_archive->action_data = data_extract_all; tar_archive->action_data = data_extract_all;
need_args = 2; if (!extract_dir)
extract_dir = "./DEBIAN";
}
if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) { // -Xx
if (opt & DPKG_DEB_OPT_EXTRACT_VERBOSE)
tar_archive->action_header = header_list;
tar_archive->action_data = data_extract_all;
if (!extract_dir)
bb_show_usage();
} }
if (need_args != argc) { /* Standard tool supports "-" */
bb_show_usage(); tar_archive->src_fd = ar_archive->src_fd = xopen_stdin(argv[0]);
}
tar_archive->src_fd = ar_archive->src_fd = xopen(argv[0], O_RDONLY);
/* Work out where to extract the files */
/* 2nd argument is a dir name */
if (argv[1]) {
extract_dir = argv[1];
}
if (extract_dir) { if (extract_dir) {
mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */ mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */
xchdir(extract_dir); xchdir(extract_dir);