X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Far.c;h=983b5ae2cd8ef965fdb5af7f27737b369b0a3043;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=d8c8d465b88e92d1a3110b3b49508f656426ecfb;hpb=bf181b9338152759fd56c8009e9a962a84808e7c;p=oweals%2Fbusybox.git diff --git a/archival/ar.c b/archival/ar.c index d8c8d465b..983b5ae2c 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -1,9 +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 + * Written by Glenn McGrath 1 June 2000 * * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar. * @@ -21,300 +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 10 June 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" - -#define AR_BLOCK_SIZE 60 -#define AR_PRESERVE_DATE 1 /* preserve original dates */ -#define AR_VERBOSE 2 /* be verbose */ -#define AR_DISPLAY 4 /* display contents */ -#define AR_EXT_TO_FILE 8 /* extract contents of archive */ -#define AR_EXT_TO_STDOUT 16 /* extract to stdout */ +#include -#define BB_DECLARE_EXTERN -#define bb_need_io_error -#include "messages.c" +#include "unarchive.h" +#include "busybox.h" -struct ArHeader { /* Byte Offset */ - char ar_name[16]; /* 0-15 */ - char ar_date[12]; /* 16-27 */ - char ar_uid[6], ar_gid[6]; /* 28-39 */ - char ar_mode[8]; /* 40-47 */ - char ar_size[10]; /* 48-57 */ - char ar_fmag[2]; /* 58-59 */ -}; -typedef struct ArHeader ArHeader; - -struct ArInfo { - char name[17]; /* File name */ - time_t date; /* long int, No of seconds since epoch */ - uid_t uid; /* unsigned int, Numeric UID */ - gid_t gid; /* unsigned int, Numeric GID */ - mode_t mode; /* unsigned int, Unix mode */ - size_t size; /* int, Size of the file */ -}; -typedef struct ArInfo ArInfo; - -/* - * Display details of a file, verbosly if funct=2 - */ -static void displayEntry(struct ArInfo *entry, int funct) +static void header_verbose_list_ar(const file_header_t *file_header) { - /* TODO convert mode to string */ - if ((funct & AR_VERBOSE) == AR_VERBOSE) - printf("%i %i/%i %8i %s ", entry->mode, entry->uid, entry->gid, - entry->size, timeString(entry->date)); - printf("%s\n", entry->name); + 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); } -/* this is from tar.c remove later*/ -static long getOctal(const char *cp, int size) -{ - long val = 0; - - for(;(size > 0) && (*cp == ' '); cp++, size--); - if ((size == 0) || !isOctal(*cp)) - return -1; - for(; (size > 0) && isOctal(*cp); size--) { - val = val * 8 + *cp++ - '0'; - } - for (;(size > 0) && (*cp == ' '); cp++, size--); - if ((size > 0) && *cp) - return -1; - return val; -} +#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 -/* - * Converts from the char based struct to a new struct with stricter types - */ -static int processArHeader(struct ArHeader *rawHeader, struct ArInfo *header) +extern int ar_main(int argc, char **argv) { - int count2; - int count; + archive_handle_t *archive_handle; + unsigned long opt; + static const char msg_unsupported_err[] = + "Archive %s not supported. Install binutils 'ar'."; + char magic[8]; + + archive_handle = init_handle(); - /* check end of header marker is valid */ - if ((rawHeader->ar_fmag[0]!='`') || (rawHeader->ar_fmag[1]!='\n')) - return(FALSE); + /* 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"); - /* convert filename */ - for (count = 0; count < 16; count++) { - /* allow spaces in filename except at the end */ - if (rawHeader->ar_name[count] == ' ') { - for (count2 = count; count2 < 16; count2++) - if (!isspace(rawHeader->ar_name[count2])) - break; - if (count2 >= 16) - break; - } - /* GNU ar uses '/' as an end of filename marker */ - if (rawHeader->ar_name[count] == '/') - break; - header->name[count] = rawHeader->ar_name[count]; + if (opt & AR_CTX_PRINT) { + archive_handle->action_data = data_extract_to_stdout; } - header->name[count] = '\0'; - header->date = atoi(rawHeader->ar_date); - header->uid = atoi(rawHeader->ar_uid); - header->gid = atoi(rawHeader->ar_gid); - header->mode = getOctal(rawHeader->ar_mode, sizeof(rawHeader->ar_mode)); - header->size = atoi(rawHeader->ar_size); - return (TRUE); -} - -/* - * Copy size bytes from current position if srcFd to current position in dstFd - * taken from tarExtractRegularFile in tar.c, remove later - */ -static int copySubFile(int srcFd, int dstFd, int copySize) -{ - int readSize, writeSize, doneSize; - char buffer[BUFSIZ]; - - while (copySize > 0) { - if (copySize > BUFSIZ) - readSize = BUFSIZ; - else - readSize = copySize; - writeSize = fullRead(srcFd, buffer, readSize); - if (writeSize <= 0) { - errorMsg(io_error, "copySubFile", strerror(errno)); - return (FALSE); - } - doneSize = fullWrite(dstFd, buffer, writeSize); - if (doneSize <= 0) { - errorMsg(io_error, "copySubFile", strerror(errno)); - return (FALSE); - } - copySize -= doneSize; + if (opt & AR_CTX_LIST) { + archive_handle->action_header = header_list; } - return (TRUE); -} - -/* - * Extract the file described in ArInfo to the specified path - * set the new files uid, gid and mode - */ -static int extractToFile(struct ArInfo *file, int funct, int srcFd, const char *path) -{ - int dstFd, temp; - struct stat tmpStat; - char *pathname = NULL; - struct utimbuf newtime; - - if ((temp = isDirectory(path, TRUE, &tmpStat)) != TRUE) { - if (!createPath(path, 0777)) { - fatalError("Cannot extract to specified path"); - return (FALSE); - } + if (opt & AR_CTX_EXTRACT) { + archive_handle->action_data = data_extract_all; } - temp = (strlen(path) + 16); - pathname = (char *) xmalloc(temp); - pathname = strcpy(pathname, path); - pathname = strcat(pathname, file->name); - dstFd = device_open(pathname, O_WRONLY | O_CREAT); - temp = copySubFile(srcFd, dstFd, file->size); - fchown(dstFd, file->uid, file->gid); - fchmod(dstFd, file->mode); - close(dstFd); - if ((funct&AR_PRESERVE_DATE)==AR_PRESERVE_DATE) - newtime.modtime=file->date; - else - newtime.modtime=time(0); - newtime.actime=time(0); - temp = utime(pathname, &newtime); - return (TRUE); -} - -/* - * Return a file descriptor for the specified file and do error checks - */ -static int getArFd(char *filename) -{ - int arFd; - char arVersion[8]; - - arFd = open(filename, O_RDONLY); - if (arFd < 0) { - errorMsg("Error opening '%s': %s\n", filename, strerror(errno)); - return (FALSE); + 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"); } - if (fullRead(arFd, arVersion, 8) <= 0) { - errorMsg( "Unexpected EOF in archive\n"); - return (FALSE); - } - if (strncmp(arVersion,"!",7) != 0) { - errorMsg("ar header fails check "); - return(FALSE); - } - return arFd; -} - -/* - * Step through the ar file and process it one entry at a time - * fileList[0] is the name of the ar archive - * fileList[1] and up are filenames to extract from the archive - * funct contains flags to specify the actions to be performed - */ -static int readArFile(char *fileList[16], int fileListSize, int funct) -{ - int arFd, status, extFileFlag, i, lastOffset=0; - ArHeader rawArHeader; - ArInfo arEntry; - - /* open the ar archive */ - arFd=getArFd(fileList[0]); - - /* read the first header, then loop until ono more headers */ - while ((status = fullRead(arFd, (char *) &rawArHeader, AR_BLOCK_SIZE)) - == AR_BLOCK_SIZE) { - - /* check the header is valid, if not try reading the header - agian with an offset of 1, needed as some ar archive end - with a '\n' which isnt counted in specified file size */ - if ((status=processArHeader(&rawArHeader, &arEntry))==FALSE ) { - if ((i=lseek(arFd, 0, SEEK_CUR))==(lastOffset+60)) - lseek(arFd, lastOffset+1, SEEK_SET); - else - return(FALSE); - } - else { - extFileFlag=0; - - if (funct&AR_DISPLAY) - displayEntry(&arEntry, funct); - /* check file was specified to be extracted only if - some file were specified */ - if ((funct&AR_EXT_TO_FILE) || (funct&AR_EXT_TO_STDOUT)){ - if (fileListSize==1) - extFileFlag=1; - else { - for( i=1; i<=fileListSize; i++) - if ((status=(strcmp(fileList[i],arEntry.name)))==0) - extFileFlag=1; - } - } - if (extFileFlag==1) { - if (funct&AR_EXT_TO_FILE) - extractToFile(&arEntry, funct, arFd, "./"); - else - copySubFile(arFd,fileno(stdout),arEntry.size); - } - else - lseek(arFd, arEntry.size, SEEK_CUR); - lastOffset=lseek(arFd, 0, SEEK_CUR); - } /* if processArHeader */ - } /* while */ - return (TRUE); -} + archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); -extern int ar_main(int argc, char **argv) -{ - int funct = 0, ret=0, i=0; - char *fileList[16], c, *opt_ptr; - - if (argc < 2) - usage(ar_usage); + while (optind < argc) { + archive_handle->filter = filter_accept_list; + archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]); + } - opt_ptr = argv[1]; - if (*opt_ptr == '-') - ++opt_ptr; - while ((c = *opt_ptr++) != '\0') { - switch (c) { - case 'o': - funct = funct | AR_PRESERVE_DATE; - break; - case 'v': - funct = funct | AR_VERBOSE; - break; - case 't': - funct = funct | AR_DISPLAY; - break; - case 'x': - funct = funct | AR_EXT_TO_FILE; - break; - case 'p': - funct = funct | AR_EXT_TO_STDOUT; - 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"); } + archive_handle->offset += 7; - for(i=0; i<(argc-2); i++) - fileList[i]=argv[i+2]; - - if (funct > 3) - ret = readArFile(fileList, (argc-2), funct); - - return (ret); + while (get_header_ar(archive_handle) == EXIT_SUCCESS); + + return EXIT_SUCCESS; }