X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Far.c;h=983b5ae2cd8ef965fdb5af7f27737b369b0a3043;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=4c3d0bbd5110e6c5974fcb6b9f65a883c5e1b266;hpb=47fd219c956d1963fca0ba73ff7b21b1273977a7;p=oweals%2Fbusybox.git diff --git a/archival/ar.c b/archival/ar.c index 4c3d0bbd5..983b5ae2c 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Mini ar implementation for busybox + * Mini ar implementation for busybox * * Copyright (C) 2000 by Glenn McGrath - * Written by Glenn McGrath 1 June 2000 - * + * Written by Glenn McGrath 1 June 2000 + * * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar. * * This program is free software; you can redistribute it and/or modify @@ -21,107 +21,92 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * There is no single standard to adhere to so ar may not portable + * between different systems + * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html */ + #include +#include #include -#include +#include +#include +#include #include + +#include "unarchive.h" #include "busybox.h" -extern int ar_main(int argc, char **argv) +static void header_verbose_list_ar(const file_header_t *file_header) { - const int preserve_date = 1; /* preserve original dates */ - const int verbose = 2; /* be verbose */ - const int display = 4; /* display contents */ - const int extract_to_file = 8; /* extract contents of archive */ - const int extract_to_stdout = 16; /* extract to stdout */ + const char *mode = bb_mode_string(file_header->mode); + char *mtime; - FILE *src_file = NULL, *dst_file = NULL; - int funct = 0, opt=0; + mtime = ctime(&file_header->mtime); + mtime[16] = ' '; + memmove(&mtime[17], &mtime[20], 4); + mtime[21] = '\0'; + printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid, (int) file_header->size, &mtime[4], file_header->name); +} + +#define AR_CTX_PRINT 0x01 +#define AR_CTX_LIST 0x02 +#define AR_CTX_EXTRACT 0x04 +#define AR_OPT_PRESERVE_DATE 0x08 +#define AR_OPT_VERBOSE 0x10 +#define AR_OPT_CREATE 0x20 +#define AR_OPT_INSERT 0x40 - ar_headers_t *head, *ar_extract_list=NULL; +extern int ar_main(int argc, char **argv) +{ + archive_handle_t *archive_handle; + unsigned long opt; + static const char msg_unsupported_err[] = + "Archive %s not supported. Install binutils 'ar'."; + char magic[8]; - ar_extract_list = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t)); - head = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t)); + archive_handle = init_handle(); + + /* Prepend '-' to the first argument if required */ + bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt"; + opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); - while ((opt = getopt(argc, argv, "ovtpx")) != -1) { - switch (opt) { - case 'o': - funct |= preserve_date; - break; - case 'v': - funct |= verbose; - break; - case 't': - funct |= display; - break; - case 'p': - funct |= extract_to_stdout; - break; - case 'x': - funct |= extract_to_file; - break; - default: - show_usage(); - } + if (opt & AR_CTX_PRINT) { + archive_handle->action_data = data_extract_to_stdout; } - - /* check the src filename was specified */ - if (optind == argc) { - show_usage(); + if (opt & AR_CTX_LIST) { + archive_handle->action_header = header_list; } - - if ( (src_file = wfopen(argv[optind], "r")) < 0) { - error_msg_and_die("Cannot read %s", argv[optind]); + if (opt & AR_CTX_EXTRACT) { + archive_handle->action_data = data_extract_all; } - - optind++; - head = get_ar_headers(src_file); - /* find files to extract or display */ - /* search through argv and build extract list */ - for (;optind < argc; optind++) { - ar_headers_t *ar_entry; - ar_entry = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t)); - ar_entry = head; - while (ar_entry->next != NULL) { - if (strcmp(argv[optind], ar_entry->name) == 0) { - ar_headers_t *tmp; - tmp = (ar_headers_t *) xmalloc(sizeof(ar_headers_t)); - *tmp = *ar_extract_list; - *ar_extract_list = *ar_entry; - ar_extract_list->next = tmp; - break; - } - ar_entry=ar_entry->next; - } + if (opt & AR_OPT_PRESERVE_DATE) { + archive_handle->flags |= ARCHIVE_PRESERVE_DATE; + } + if (opt & AR_OPT_VERBOSE) { + archive_handle->action_header = header_verbose_list_ar; + } + if (opt & AR_OPT_CREATE) { + bb_error_msg_and_die(msg_unsupported_err, "creation"); } + if (opt & AR_OPT_INSERT) { + bb_error_msg_and_die(msg_unsupported_err, "insertion"); + } + + archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); - /* if individual files not found extract all files */ - if (ar_extract_list->next==NULL) { - ar_extract_list = head; + while (optind < argc) { + archive_handle->filter = filter_accept_list; + archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]); } - /* find files to extract or display */ - while (ar_extract_list->next != NULL) { - if (funct & extract_to_file) { - dst_file = wfopen(ar_extract_list->name, "w"); - } - else if (funct & extract_to_stdout) { - dst_file = stdout; - } - if ((funct & extract_to_file) || (funct & extract_to_stdout)) { - fseek(src_file, ar_extract_list->offset, SEEK_SET); - copy_file_chunk(src_file, dst_file, ar_extract_list->size); - } - if (funct & verbose) { - printf("%s %d/%d %8d %s ", mode_string(ar_extract_list->mode), - ar_extract_list->uid, ar_extract_list->gid, - (int) ar_extract_list->size, time_string(ar_extract_list->mtime)); - } - if ((funct & display) || (funct & verbose)){ - printf("%s\n", ar_extract_list->name); - } - ar_extract_list = ar_extract_list->next; + archive_xread_all(archive_handle, magic, 7); + if (strncmp(magic, "!", 7) != 0) { + bb_error_msg_and_die("Invalid ar magic"); } + archive_handle->offset += 7; + + while (get_header_ar(archive_handle) == EXIT_SUCCESS); + return EXIT_SUCCESS; }