X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Far.c;h=983b5ae2cd8ef965fdb5af7f27737b369b0a3043;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=71cde4ebe9c8cbb44094f90bde6063b577b22fca;hpb=237ae42fc96ede945d28d9054f045b73e419d089;p=oweals%2Fbusybox.git diff --git a/archival/ar.c b/archival/ar.c index 71cde4ebe..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,26 +21,25 @@ * 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 signle standard to adhere to so ar may not portable + * 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 -#include + #include "unarchive.h" #include "busybox.h" static void header_verbose_list_ar(const file_header_t *file_header) { - const char *mode = mode_string(file_header->mode); + const char *mode = bb_mode_string(file_header->mode); char *mtime; mtime = ctime(&file_header->mtime); @@ -50,95 +49,64 @@ static void header_verbose_list_ar(const file_header_t *file_header) 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); } -#if !defined CONFIG_TAR && !defined CONFIG_DPKG_DEB && !defined CONFIG_CPIO -/* This is simpler than data_extract_all */ -static void data_extract_regular_file(archive_handle_t *archive_handle) -{ - file_header_t *file_header; - int dst_fd; - - file_header = archive_handle->file_header; - dst_fd = xopen(file_header->name, O_WRONLY | O_CREAT); - archive_copy_file(archive_handle, dst_fd); - close(dst_fd); - - chmod(file_header->name, file_header->mode); - chown(file_header->name, file_header->uid, file_header->gid); - - if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) { - struct utimbuf t; - t.actime = t.modtime = file_header->mtime; - utime(file_header->name, &t); - } - - return; -} -#endif +#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 extern int ar_main(int argc, char **argv) { archive_handle_t *archive_handle; - int opt; - -#if !defined CONFIG_DPKG_DEB && !defined CONFIG_DPKG + unsigned long opt; + static const char msg_unsupported_err[] = + "Archive %s not supported. Install binutils 'ar'."; char magic[8]; -#endif + 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, "covtpxX")) != -1) { - switch (opt) { - case 'p': /* print */ - archive_handle->action_data = data_extract_to_stdout; - break; - case 't': /* list contents */ - archive_handle->action_header = header_list; - break; - case 'X': - archive_handle->action_header = header_verbose_list_ar; - case 'x': /* extract */ -#if defined CONFIG_TAR || defined CONFIG_DPKG_DEB || defined CONFIG_CPIO - archive_handle->action_data = data_extract_all; -#else - archive_handle->action_data = data_extract_regular_file; -#endif - break; - /* Modifiers */ - case 'o': /* preserve original dates */ - archive_handle->flags |= ARCHIVE_PRESERVE_DATE; - break; - case 'v': /* verbose */ - archive_handle->action_header = header_verbose_list_ar; - break; - default: - show_usage(); - } + if (opt & AR_CTX_PRINT) { + archive_handle->action_data = data_extract_to_stdout; + } + if (opt & AR_CTX_LIST) { + archive_handle->action_header = header_list; + } + if (opt & AR_CTX_EXTRACT) { + archive_handle->action_data = data_extract_all; + } + 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"); } - - /* check the src filename was specified */ - if (optind == argc) { - show_usage(); + if (opt & AR_OPT_INSERT) { + bb_error_msg_and_die(msg_unsupported_err, "insertion"); } - archive_handle->src_fd = xopen(argv[optind++], O_RDONLY); + archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); - /* TODO: This is the same as in tar, seperate function ? */ while (optind < argc) { archive_handle->filter = filter_accept_list; - archive_handle->accept = add_to_list(archive_handle->accept, argv[optind]); - optind++; + archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]); } -#if defined CONFIG_DPKG_DEB || defined CONFIG_DPKG - unpack_ar_archive(archive_handle); -#else archive_xread_all(archive_handle, magic, 7); if (strncmp(magic, "!", 7) != 0) { - error_msg_and_die("Invalid ar magic"); + bb_error_msg_and_die("Invalid ar magic"); } archive_handle->offset += 7; while (get_header_ar(archive_handle) == EXIT_SUCCESS); -#endif return EXIT_SUCCESS; }