X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ar.c;h=7f3396c8cf9af0fc8f17096eb59191b1359622ed;hb=51ded05b3bf4df6f126420d39a40d27ea0728aa9;hp=adb6982b2e21d4b50071bef7edbd6be841df3d04;hpb=bd7c67136ac961f4dd8b06514ca00de900cd1f8c;p=oweals%2Fbusybox.git diff --git a/ar.c b/ar.c index adb6982b2..7f3396c8c 100644 --- a/ar.c +++ b/ar.c @@ -3,7 +3,7 @@ * 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. * @@ -21,283 +21,69 @@ * 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 */ -#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 RECURSIVE 32 - -#define MAX_NAME_LENGTH 100 - -//#define BB_DECLARE_EXTERN -//#define bb_need_io_error -//#include "messages.c" - -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) -{ - char arMagic[8]; - if (fullRead(srcFd, arMagic, 8) != 8) - return (FALSE); - - if (strncmp(arMagic,"!",7) != 0) - return(FALSE); - return(TRUE); -} - -/* - * 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); -} - -/* - * get, check and correct the converted header - */ -static int readArEntry(int srcFd, headerL_t *newEntry) -{ - size_t nameLength; - - if(readRawArHeader(srcFd, newEntry)==FALSE) - return(FALSE); - - nameLength = strcspn(newEntry->name, "/"); - - /* 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]; - - 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); - } - } - } - return(TRUE); -} - -/* - * return the headerL_t struct for the specified filename - */ -static headerL_t *getHeaders(int srcFd, headerL_t *head, int funct) -{ - headerL_t *list; - list = (headerL_t *) malloc(sizeof(headerL_t)); - - if (checkArMagic(srcFd)==TRUE) { - while(readArEntry(srcFd, list) == TRUE) { - list->next = (headerL_t *) malloc(sizeof(headerL_t)); - *list->next = *head; - *head = *list; - - /* recursive check for sub-archives */ - if ((funct & RECURSIVE) == RECURSIVE) - head = getHeaders(srcFd, head, funct); - lseek(srcFd, head->offset + head->size, SEEK_SET); - } - } - 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; - } - 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)); - } - 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); -} +#include +#include +#include +#include "busybox.h" extern int ar_main(int argc, char **argv) { - int funct = 0, opt=0; - int srcFd=0, dstFd=0; - headerL_t *header, *entry, *extractList; - - while ((opt = getopt(argc, argv, "ovtpxR")) != -1) { + FILE *src_stream = NULL; + char **extract_names = NULL; + char ar_magic[8]; + int extract_function = extract_unconditional; + int opt; + int num_of_entries = 0; + extern off_t archive_offset; + + while ((opt = getopt(argc, argv, "ovtpx")) != -1) { switch (opt) { case 'o': - funct = funct | PRESERVE_DATE; + extract_function |= extract_preserve_date; break; case 'v': - funct = funct | VERBOSE; + extract_function |= extract_verbose_list; break; case 't': - funct = funct | DISPLAY; - break; - case 'x': - funct = funct | EXT_TO_FILE; + extract_function |= extract_list; break; case 'p': - funct = funct | EXT_TO_STDOUT; + extract_function |= extract_to_stdout; break; - case 'R': - funct = funct | RECURSIVE; + case 'x': + extract_function |= extract_all_to_fs; break; default: - usage(ar_usage); + show_usage(); } } - /* check the src filename was specified */ + /* check the src filename was specified */ if (optind == argc) { - usage(ar_usage); - return(FALSE); - } - - if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) { - errorMsg("Cannot read %s\n", optarg); - return (FALSE); - } - optind++; - entry = (headerL_t *) malloc(sizeof(headerL_t)); - header = (headerL_t *) malloc(sizeof(headerL_t)); - extractList = (headerL_t *) malloc(sizeof(headerL_t)); + show_usage(); + } + + src_stream = xfopen(argv[optind++], "r"); - header = getHeaders(srcFd, header, funct); - - /* find files to extract or display */ - if (optindnext = (headerL_t *) malloc(sizeof(headerL_t)); - *entry->next = *extractList; - *extractList = *entry; - } - optind++; - } + /* check ar magic */ + fread(ar_magic, 1, 8, src_stream); + archive_offset = 8; + if (strncmp(ar_magic,"!",7) != 0) { + error_msg_and_die("invalid 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, extractList->mode); - - 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; + + /* Create a list of files to extract */ + while (optind < argc) { + extract_names = xrealloc(extract_names, sizeof(char *) * (num_of_entries + 2)); + extract_names[num_of_entries] = xstrdup(argv[optind]); + num_of_entries++; + extract_names[num_of_entries] = NULL; + optind++; } - return (TRUE); + + unarchive(src_stream, stdout, &get_header_ar, extract_function, "./", extract_names); + return EXIT_SUCCESS; }