X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Far.c;h=983b5ae2cd8ef965fdb5af7f27737b369b0a3043;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=b758a69755a5f31b3ab7566f368f1bc79132078a;hpb=8324b9f1aacde5c1c80f0a94ba3d276787e14183;p=oweals%2Fbusybox.git diff --git a/archival/ar.c b/archival/ar.c index b758a6975..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,291 +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 9 September 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 -#include -#include -#include -#include "internal.h" - -#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 */ - -#define MAX_NAME_LENGTH 100 -//#define BB_DECLARE_EXTERN -//#define bb_need_io_error -//#include "messages.c" +#include "unarchive.h" +#include "busybox.h" -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; - -typedef struct headerL { - char name[MAX_NAME_LENGTH]; - size_t size; - uid_t uid; - gid_t gid; - mode_t mode; - time_t mtime; - off_t offset; - struct headerL *next; -} headerL_t; - -/* - * identify Ar header (magic) and set srcFd to first header entry - */ -static int checkArMagic(int srcFd) +static void header_verbose_list_ar(const file_header_t *file_header) { - char arMagic[8]; - if (fullRead(srcFd, arMagic, 8) != 8) - return (FALSE); - - if (strncmp(arMagic,"!",7) != 0) - return(FALSE); - return(TRUE); + const char *mode = bb_mode_string(file_header->mode); + char *mtime; + + 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); } -/* - * read, convert and check the raw ar header - * srcFd should be pointing to the start of header prior to entry - * srcFd will be pointing at the start of data after successful exit - * if returns FALSE srcFd is reset to initial position - */ -static int readRawArHeader(int srcFd, headerL_t *header) -{ - rawArHeader_t rawArHeader; - off_t initialOffset; - size_t nameLength; - - initialOffset = lseek(srcFd, 0, SEEK_CUR); - if (fullRead(srcFd, (char *) &rawArHeader, 60) != 60) { - lseek(srcFd, initialOffset, SEEK_SET); - return(FALSE); - } - if ((rawArHeader.fmag[0]!='`') || (rawArHeader.fmag[1]!='\n')) { - lseek(srcFd, initialOffset, SEEK_SET); - return(FALSE); - } - - strncpy(header->name, rawArHeader.name, 16); - nameLength=strcspn(header->name, " \\"); - header->name[nameLength]='\0'; - parse_mode(rawArHeader.mode, &header->mode); - header->mtime = atoi(rawArHeader.date); - header->uid = atoi(rawArHeader.uid); - header->gid = atoi(rawArHeader.gid); - header->size = (size_t) atoi(rawArHeader.size); - header->offset = initialOffset + (off_t) 60; - return(TRUE); -} +#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 -/* - * get, check and correct the converted header - */ -static int readArEntry(int srcFd, headerL_t *newEntry) +extern int ar_main(int argc, char **argv) { - size_t nameLength; + archive_handle_t *archive_handle; + unsigned long opt; + static const char msg_unsupported_err[] = + "Archive %s not supported. Install binutils 'ar'."; + char magic[8]; - if(readRawArHeader(srcFd, newEntry)==FALSE) - return(FALSE); - - nameLength = strcspn(newEntry->name, "/"); + archive_handle = init_handle(); - /* handle GNU style short filenames, strip trailing '/' */ - if (nameLength > 0) - newEntry->name[nameLength]='\0'; - - /* handle GNU style long filenames */ - if (nameLength == 0) { - /* escape from recursive call */ - if (newEntry->name[1]=='0') - return(TRUE); - - /* the data section contains the real filename */ - if (newEntry->name[1]=='/') { - char tempName[MAX_NAME_LENGTH]; + /* 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"); - if (newEntry->size > MAX_NAME_LENGTH) - newEntry->size = MAX_NAME_LENGTH; - fullRead(srcFd, tempName, newEntry->size); - tempName[newEntry->size-3]='\0'; - - /* read the second header for this entry */ - /* be carefull, this is recursive */ - if (readArEntry(srcFd, newEntry)==FALSE) - return(FALSE); - - if ((newEntry->name[0]='/') && (newEntry->name[1]='0')) - strcpy(newEntry->name, tempName); - else { - errorMsg("Invalid long filename\n"); - return(FALSE); - } - } + if (opt & AR_CTX_PRINT) { + archive_handle->action_data = data_extract_to_stdout; } - return(TRUE); -} - -/* - * return the headerL_t struct for the specified filename - */ -static headerL_t *getHeaders(int srcFd, headerL_t *head) -{ - int arEntry=FALSE; - headerL_t *list; - list = (headerL_t *) malloc(sizeof(headerL_t)); - - if (checkArMagic(srcFd)==TRUE) - arEntry=TRUE; - else - errorMsg("isnt an ar archive\n"); - - if (arEntry==TRUE) { - while(readArEntry(srcFd, list) == TRUE) { - list->next = (headerL_t *) malloc(sizeof(headerL_t)); - *list->next = *head; - *head = *list; - - /* recursive check for sub-archives */ - lseek(srcFd, list->size, SEEK_CUR); -/* printf("checking for sub headers\n"); - if ((subList = getHeaders(srcFd, list->next)) != NULL) { - printf("found a sub archive !\n"); - } - else - printf("didnt find a sub header\n"); */ - } + if (opt & AR_CTX_LIST) { + archive_handle->action_header = header_list; } - - return(head); -} - -/* - * find an entry in the linked list matching the filename - */ -static headerL_t *findEntry(headerL_t *head, const char *filename) -{ - while(head->next != NULL) { - if (strcmp(filename, head->name)==0) - return(head); - head=head->next; + if (opt & AR_CTX_EXTRACT) { + archive_handle->action_data = data_extract_all; } - return(NULL); -} - -/* - * populate linked list with all ar file entries and offset - */ -static int displayEntry(headerL_t *head, int funct) -{ - if ((funct & VERBOSE) == VERBOSE) { - printf("%s %d/%d %8d %s ", modeString(head->mode), head->uid, head->gid, head->size, timeString(head->mtime)); + 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"); } - printf("%s\n", head->name); - head = head->next; - return(TRUE); -} - -static int extractAr(int srcFd, int dstFd, headerL_t *file) -{ - 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; - headerL_t *header, *entry, *extractList; + archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); - 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 ( (srcFd = open(optarg, O_RDONLY)) < 0) { - errorMsg("Cannot read %s\n", optarg); - return (FALSE); - } - break; - default: - usage(ar_usage); - } + while (optind < argc) { + archive_handle->filter = filter_accept_list; + archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]); } - - /* check options not just preserve_dates and/or verbose */ - if (funct < 4) { - usage(ar_usage); - return(FALSE); - } - - entry = (headerL_t *) malloc(sizeof(headerL_t)); - header = (headerL_t *) malloc(sizeof(headerL_t)); - extractList = (headerL_t *) malloc(sizeof(headerL_t)); - header = getHeaders(srcFd, header); - - /* find files to extract or display */ - if (optindnext = (headerL_t *) malloc(sizeof(headerL_t)); - *entry->next = *extractList; - *extractList = *entry; - } - optind++; - } + archive_xread_all(archive_handle, magic, 7); + if (strncmp(magic, "!", 7) != 0) { + bb_error_msg_and_die("Invalid ar magic"); } - else - /* extract everything */ - extractList = header; - - while(extractList->next != NULL) { - if ( (funct & EXT_TO_FILE) == EXT_TO_FILE) { - dstFd = open(extractList->name, O_WRONLY | O_CREAT); - extractAr(srcFd, dstFd, extractList); - } - if ( (funct & EXT_TO_STDOUT) == EXT_TO_STDOUT) - extractAr(srcFd, fileno(stdout), extractList); - if ( (funct & DISPLAY) == DISPLAY) - displayEntry(extractList, funct); - extractList=extractList->next; - } - return (TRUE); + archive_handle->offset += 7; + + while (get_header_ar(archive_handle) == EXIT_SUCCESS); + + return EXIT_SUCCESS; }