X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fdpkg_deb.c;h=2d7383fd7988f62b2844ca8d27312dc8bed80b24;hb=56f16b42c93af18fbb984e8d6384c03e5405e3ae;hp=32ef4ca75ca1c66bd2bfdd2eef446825e3f19066;hpb=bc9afadecd96881567ea9b66c9c7d390592716fe;p=oweals%2Fbusybox.git diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 32ef4ca75..2d7383fd7 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c @@ -13,152 +13,95 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -/* - * Merge this applet into dpkg when dpkg becomes more stable - */ - -#include -#include #include -#include -#include #include +#include +#include +#include +#include "unarchive.h" #include "busybox.h" -typedef struct ar_headers_s { - char *name; - size_t size; - uid_t uid; - gid_t gid; - mode_t mode; - time_t mtime; - off_t offset; - struct ar_headers_s *next; -} ar_headers_t; - -extern ar_headers_t get_ar_headers(int srcFd); -extern int tar_unzip_init(int tarFd); -extern int readTarFile(int tarFd, int extractFlag, int listFlag, - int tostdoutFlag, int verboseFlag, char** extractList, char** excludeList); - -const int dpkg_deb_contents = 1; -const int dpkg_deb_control = 2; -// const int dpkg_deb_info = 4; -const int dpkg_deb_extract = 8; -const int dpkg_deb_verbose_extract = 16; - -extern int deb_extract(int optflags, const char *dir_name, const char *deb_filename) +extern int dpkg_deb_main(int argc, char **argv) { - char **extract_list = NULL; - ar_headers_t *ar_headers = NULL; - char ar_filename[15]; - int extract_flag = FALSE; - int list_flag = FALSE; - int verbose_flag = FALSE; - int extract_to_stdout = FALSE; - int srcFd = 0; - int status; - - if (dpkg_deb_contents == (dpkg_deb_contents & optflags)) { - strcpy(ar_filename, "data.tar.gz"); - verbose_flag = TRUE; - list_flag = TRUE; - } - if (dpkg_deb_control == (dpkg_deb_control & optflags)) { - strcpy(ar_filename, "control.tar.gz"); - extract_flag = TRUE; - } - if (dpkg_deb_extract == (dpkg_deb_extract & optflags)) { - strcpy(ar_filename, "data.tar.gz"); - extract_flag = TRUE; - } - if (dpkg_deb_verbose_extract == (dpkg_deb_verbose_extract & optflags)) { - strcpy(ar_filename, "data.tar.gz"); - extract_flag = TRUE; - list_flag = TRUE; - } - - ar_headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t)); - srcFd = open(deb_filename, O_RDONLY); + archive_handle_t *ar_archive; + archive_handle_t *tar_archive; + int opt = 0; +#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY + llist_t *control_tar_llist = NULL; +#endif - *ar_headers = get_ar_headers(srcFd); - if (ar_headers->next == NULL) { - error_msg_and_die("Couldnt find %s in %s", ar_filename, deb_filename); - } + /* Setup the tar archive handle */ + tar_archive = init_handle(); - while (ar_headers->next != NULL) { - if (strcmp(ar_headers->name, ar_filename) == 0) { - break; - } - ar_headers = ar_headers->next; - } - lseek(srcFd, ar_headers->offset, SEEK_SET); - srcFd = tar_unzip_init(srcFd); - if ( dir_name != NULL) { - if (is_directory(dir_name, TRUE, NULL)==FALSE) { - mkdir(dir_name, 0755); - } - if (chdir(dir_name)==-1) { - error_msg_and_die("Cannot change to dir %s", dir_name); - } - } - status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list); + /* Setup an ar archive handle that refers to the gzip sub archive */ + ar_archive = init_handle(); + ar_archive->sub_archive = tar_archive; + ar_archive->filter = filter_accept_list_reassign; - return status; -} +#ifdef CONFIG_FEATURE_DEB_TAR_GZ + ar_archive->accept = llist_add_to(NULL, "data.tar.gz"); +# ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY + control_tar_llist = llist_add_to(NULL, "control.tar.gz"); +# endif +#endif -extern int dpkg_deb_main(int argc, char **argv) -{ - char *target_dir = NULL; - int opt = 0; - int optflag = 0; - - while ((opt = getopt(argc, argv, "cexX")) != -1) { +#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 + ar_archive->accept = llist_add_to(ar_archive->accept, "data.tar.bz2"); +# ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY + control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2"); +# endif +#endif + +#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY + while ((opt = getopt(argc, argv, "cefXx")) != -1) { +#else + while ((opt = getopt(argc, argv, "x")) != -1) { +#endif switch (opt) { +#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY case 'c': - optflag |= dpkg_deb_contents; + tar_archive->action_header = header_verbose_list; break; case 'e': - optflag |= dpkg_deb_control; + ar_archive->accept = control_tar_llist; + tar_archive->action_data = data_extract_all; break; - case 'X': - optflag |= dpkg_deb_verbose_extract; + case 'f': + /* Print the entire control file + * it should accept a second argument which specifies a + * specific field to print */ + ar_archive->accept = control_tar_llist; + tar_archive->accept = llist_add_to(NULL, "./control");; + tar_archive->filter = filter_accept_list; + tar_archive->action_data = data_extract_to_stdout; break; + case 'X': + tar_archive->action_header = header_list; +#endif case 'x': - optflag |= dpkg_deb_extract; - break; -/* case 'I': - optflag |= dpkg_deb_info; + tar_archive->action_data = data_extract_all; break; -*/ default: - usage(dpkg_deb_usage); - return EXIT_FAILURE; + bb_show_usage(); } } - if (((optind + 1 ) > argc) || (optflag == 0)) { - usage(dpkg_deb_usage); - return(EXIT_FAILURE); - } - if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) { - if ( (optind + 1) == argc ) { - target_dir = (char *) xmalloc(7); - strcpy(target_dir, "DEBIAN"); - } else { - target_dir = (char *) xmalloc(strlen(argv[optind + 1])); - strcpy(target_dir, argv[optind + 1]); - } - } - deb_extract(optflag, target_dir, argv[optind]); -/* else if (optflag & dpkg_deb_info) { - extract_flag = TRUE; - extract_to_stdout = TRUE; - strcpy(ar_filename, "control.tar.gz"); - extract_list = argv+optind+1; - printf("list one is [%s]\n",extract_list[0]); + if (optind + 2 < argc) { + bb_show_usage(); } -*/ + + tar_archive->src_fd = ar_archive->src_fd = bb_xopen(argv[optind++], O_RDONLY); + + /* Workout where to extract the files */ + /* 2nd argument is a dir name */ + mkdir(argv[optind], 0777); + chdir(argv[optind]); + + unpack_ar_archive(ar_archive); + + /* Cleanup */ + close (ar_archive->src_fd); + return(EXIT_SUCCESS); } +