X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fdpkg_deb.c;h=a933c69483010a221ea82e2f43c96a7d30e64dfb;hb=a8412dbf39be75b546038c8665bff8f7cbf37553;hp=337e6e10dc786b9e8101d856eb792c676d04d75a;hpb=59c09d06e34df81f55e463fc61e69d5081eb5161;p=oweals%2Fbusybox.git diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 337e6e10d..a933c6948 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c @@ -14,146 +14,117 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include -#include +#include +#include #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_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); - extern int dpkg_deb_main(int argc, char **argv) { - 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; - int opt=0; - int optflag=0; - int extract_flag = FALSE; - int list_flag = FALSE; - int verbose_flag = FALSE; - int extract_to_stdout = FALSE; - char ar_filename[15]; - int srcFd=0; - int status=0; - ar_headers_t *ar_headers = NULL; - char **extract_list=NULL; - char *target_dir=NULL; + char *prefix = NULL; + char *filename = NULL; + char *output_buffer = NULL; + int opt = 0; + int arg_type = 0; + int deb_extract_funct = extract_create_leading_dirs | extract_unconditional; - while ((opt = getopt(argc, argv, "cexX")) != -1) { + const int arg_type_prefix = 1; + const int arg_type_field = 2; + const int arg_type_filename = 4; +// const int arg_type_un_ar_gz = 8; + + while ((opt = getopt(argc, argv, "ceftXxI")) != -1) { switch (opt) { case 'c': - optflag |= dpkg_deb_contents; + deb_extract_funct |= extract_data_tar_gz; + deb_extract_funct |= extract_verbose_list; break; case 'e': - optflag |= dpkg_deb_control; + arg_type = arg_type_prefix; + deb_extract_funct |= extract_control_tar_gz; + deb_extract_funct |= extract_all_to_fs; break; -/* case 'I': - optflag |= dpkg_deb_info; + case 'f': + arg_type = arg_type_field; + deb_extract_funct |= extract_control_tar_gz; + deb_extract_funct |= extract_one_to_buffer; + filename = xstrdup("./control"); break; -*/ - case 'x': - optflag |= dpkg_deb_extract; + case 't': /* --fsys-tarfile, i just made up this short name */ + /* Integrate the functionality needed with some code from ar.c */ + error_msg_and_die("Option disabled"); +// arg_type = arg_type_un_ar_gz; break; case 'X': - optflag |= dpkg_deb_verbose_extract; + arg_type = arg_type_prefix; + deb_extract_funct |= extract_data_tar_gz; + deb_extract_funct |= extract_all_to_fs; + deb_extract_funct |= extract_list; + case 'x': + arg_type = arg_type_prefix; + deb_extract_funct |= extract_data_tar_gz; + deb_extract_funct |= extract_all_to_fs; + break; + case 'I': + arg_type = arg_type_filename; + deb_extract_funct |= extract_control_tar_gz; + deb_extract_funct |= extract_one_to_buffer; break; default: - usage(dpkg_deb_usage); - return EXIT_FAILURE; + show_usage(); } } - if (((optind + 1 ) > argc) || (optflag == 0)) { - usage(dpkg_deb_usage); - return(EXIT_FAILURE); - } - - if (optflag & dpkg_deb_contents) { - list_flag = TRUE; - verbose_flag = TRUE; - strcpy(ar_filename, "data.tar.gz"); + if (optind == argc) { + show_usage(); } - else if (optflag & dpkg_deb_control) { - extract_flag = TRUE; - strcpy(ar_filename, "control.tar.gz"); - 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]); - } - } -/* 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]); - } -*/ - else if (optflag & dpkg_deb_extract) { - extract_flag = TRUE; - strcpy(ar_filename, "data.tar.gz"); - if ( (optind + 2) > argc ) { - error_msg_and_die("No directory specified\n"); + /* Workout where to extract the files */ + if (arg_type == arg_type_prefix) { + /* argument is a dir name */ + if ((optind + 1) == argc ) { + prefix = xstrdup("./DEBIAN/"); + } else { + prefix = (char *) xmalloc(strlen(argv[optind + 1]) + 2); + strcpy(prefix, argv[optind + 1]); + /* Make sure the directory has a trailing '/' */ + if (last_char_is(prefix, '/') == NULL) { + strcat(prefix, "/"); + } } - target_dir = (char *) xmalloc(strlen(argv[optind+1])); - strcpy(target_dir, argv[optind+1]); - } - else if (optflag & dpkg_deb_verbose_extract) { - extract_flag = TRUE; - list_flag = TRUE; - strcpy(ar_filename, "data.tar.gz"); - if ( (optind + 2) > argc ) { - error_msg_and_die("No directory specified\n"); + mkdir(prefix, 0777); + } + + if (arg_type == arg_type_filename) { + if ((optind + 1) != argc) { + filename = xstrdup(argv[optind + 1]); + } else { + error_msg_and_die("-I currently requires a filename to be specified"); } - target_dir = (char *) xmalloc(strlen(argv[optind+1])); - strcpy(target_dir, argv[optind+1]); } - - ar_headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t)); - srcFd = open(argv[optind], O_RDONLY); - - *ar_headers = get_headers(srcFd); - if (ar_headers->next==NULL) - error_msg_and_die("Couldnt find %s in %s\n",ar_filename, argv[optind]); - while (ar_headers->next != NULL) { - if (strcmp(ar_headers->name, ar_filename)==0) - break; - ar_headers = ar_headers->next; + output_buffer = deb_extract(argv[optind], stdout, deb_extract_funct, prefix, filename); + + if ((arg_type == arg_type_filename) && (output_buffer != NULL)) { + puts(output_buffer); } + else if (arg_type == arg_type_field) { + char *field = NULL; + char *name; + char *value; + int field_start = 0; - lseek(srcFd, ar_headers->offset, SEEK_SET); - srcFd = tar_unzip_init(srcFd); - if ( target_dir != NULL) { - if (is_directory(target_dir, TRUE, NULL)==FALSE) { - mkdir(target_dir, 0755); - } - if (chdir(target_dir)==-1) { - error_msg_and_die("Cannot change to dir %s\n",argv[optind+1]); + while (1) { + field_start += read_package_field(&output_buffer[field_start], &name, &value); + if (name == NULL) { + break; + } + if (strcmp(name, argv[optind + 1]) == 0) { + puts(value); + } + free(field); } } - status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list); + return(EXIT_SUCCESS); }