X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Far.c;h=983b5ae2cd8ef965fdb5af7f27737b369b0a3043;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=1c598fa164654feea3e3d0104d34d99affb57545;hpb=06aeb6c417dd9d113949714486a6e6337ef70b97;p=oweals%2Fbusybox.git diff --git a/archival/ar.c b/archival/ar.c index 1c598fa16..983b5ae2c 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -1,15 +1,9 @@ /* 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 - * - * Modified 8 August 2000 by Glenn McGrath - * - now uses getopt - * - moved copySubFile function to utilities.c - * - creates linked list of all headers - * - easily accessable to other busybox functions + * Written by Glenn McGrath 1 June 2000 * * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar. * @@ -27,190 +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 * - * Last modified 25 August 2000 + * 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 "internal.h" +#include -#define BLOCK_SIZE 60 -#define PRESERVE_DATE 1 /* preserve original dates */ -#define VERBOSE 2 /* be verbose */ -#define DISPLAY 4 /* display contents */ -#define EXT_TO_FILE 8 /* extract contents of archive */ -#define EXT_TO_STDOUT 16 /* extract to stdout */ +#include "unarchive.h" +#include "busybox.h" -#define BB_DECLARE_EXTERN -#define bb_need_io_error -#include "messages.c" +static void header_verbose_list_ar(const file_header_t *file_header) +{ + const char *mode = bb_mode_string(file_header->mode); + char *mtime; -typedef struct rawArHeader { /* Byte Offset */ - char name[16]; /* 0-15 */ - char date[12]; /* 16-27 */ - char uid[6], gid[6]; /* 28-39 */ - char mode[8]; /* 40-47 */ - char size[10]; /* 48-57 */ - char fmag[2]; /* 58-59 */ -} rawArHeader_t; + 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); +} -typedef struct headerL { - char name[16]; - size_t size; - uid_t uid; - gid_t gid; - mode_t mode; - time_t mtime; - off_t offset; - struct headerL *next; -} headerL_t; +#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 -/* - * populate linked list with all ar file entries and offset - */ -static int parseArArchive(int srcFd, headerL_t *current) +extern int ar_main(int argc, char **argv) { - off_t lastOffset=0, thisOffset=0; - char arVersion[8]; - rawArHeader_t rawArHeader; - - lseek(srcFd, 0, SEEK_SET); - if (fullRead(srcFd, arVersion, 8) <= 0) { - errorMsg("Invalid header magic\n"); - return (FALSE); - } - if (strncmp(arVersion,"!",7) != 0) { - errorMsg("This doesnt appear to be an ar archive\n"); - return(FALSE); - } - while (fullRead(srcFd, (char *) &rawArHeader, 60) == 60) { - if ( (rawArHeader.fmag[0] == '`') && - (rawArHeader.fmag[1] == '\n')) { - sscanf(rawArHeader.name, "%s", current->name); - parse_mode(rawArHeader.mode, ¤t->mode); - current->mtime = atoi(rawArHeader.date); - current->uid = atoi(rawArHeader.uid); - current->gid = atoi(rawArHeader.gid); - current->size = (size_t) atoi(rawArHeader.size); - current->offset = lseek(srcFd, 0 , SEEK_CUR); - current->next = (headerL_t *) xmalloc(sizeof(headerL_t)); - lastOffset = lseek(srcFd, (off_t) current->size, SEEK_CUR); - current = current->next; - } - else { /* GNU ar has an extra char after data */ - thisOffset=lseek(srcFd, 0, SEEK_CUR); - if ( (thisOffset - lastOffset) > ((off_t) 61) ) - return(FALSE); - lseek(srcFd, thisOffset - 59, SEEK_SET); - } - } - return(FALSE); -} + archive_handle_t *archive_handle; + unsigned long opt; + static const char msg_unsupported_err[] = + "Archive %s not supported. Install binutils 'ar'."; + char magic[8]; -/* - * return the headerL_t struct for the specified filename - */ -static headerL_t *getSubFileHeader(int srcFd, const char filename[16]) -{ - headerL_t *list; - list = xmalloc(sizeof(headerL_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"); - parseArArchive(srcFd, list); - while (list->next != NULL) { - if (strncmp(list->name, filename, strlen(filename))==0) - return(list); - list=list->next; - } - return(NULL); -} + 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"); + } + if (opt & AR_OPT_INSERT) { + bb_error_msg_and_die(msg_unsupported_err, "insertion"); + } -/* - * populate linked list with all ar file entries and offset - */ -static int displayEntry(int srcFd, const char filename[16], int funct) -{ - headerL_t *file; + archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); - if ((file = getSubFileHeader(srcFd, filename)) == NULL) - return(FALSE); - if ((funct & VERBOSE) == VERBOSE) { - printf("%s %d/%d %8d %s ", modeString(file->mode), file->uid, file->gid, file->size, timeString(file->mtime)); + while (optind < argc) { + archive_handle->filter = filter_accept_list; + archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]); } - printf("%s\n", file->name); - return(TRUE); -} -static int extractAr(int srcFd, int dstFd, const char filename[16]) -{ - headerL_t *file; - - if ( (file = getSubFileHeader(srcFd, filename)) == NULL) - return(FALSE); - lseek(srcFd, file->offset, SEEK_SET); - if (copySubFile(srcFd, dstFd, (size_t) file->size) == TRUE) - return(TRUE); - return(FALSE); -} - -extern int ar_main(int argc, char **argv) -{ - int funct = 0, opt=0; - int srcFd=0, dstFd=0; - - while ((opt = getopt(argc, argv, "ovt:p:x:")) != -1) { - switch (opt) { - case 'o': - funct = funct | PRESERVE_DATE; - break; - case 'v': - funct = funct | VERBOSE; - break; - case 't': - funct = funct | DISPLAY; - case 'x': - if (opt=='x') { - funct = funct | EXT_TO_FILE; - } - case 'p': - if (opt=='p') { - funct = funct | EXT_TO_STDOUT; - } - /* following is common to 't','x' and 'p' */ - if (optarg == NULL) { - printf("expected a filename\n"); - return(FALSE); - } - if ( (srcFd = open(optarg, O_RDONLY)) < 0) { - errorMsg("Cannot read %s\n", optarg); - return (FALSE); - } - break; - default: - usage(ar_usage); - } + archive_xread_all(archive_handle, magic, 7); + if (strncmp(magic, "!", 7) != 0) { + bb_error_msg_and_die("Invalid ar magic"); } - - /* check options not just preserve_dates and/or verbose */ - if (funct < 4) { - usage(ar_usage); - return(FALSE); - } - - /* find files to extract */ - if (optindoffset += 7; + + while (get_header_ar(archive_handle) == EXIT_SUCCESS); + + return EXIT_SUCCESS; }