X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libbb%2Funarchive.c;h=62ca2674e4aec15024a0ee1fc91050c30580a12a;hp=bd10ad92d6cdd42d2bb42c711af8680805aa5280;hb=bc4e5966d81e22dd7ea57ef24025ffdbf9a0bcfd;hpb=3f4b79e8ce98192e59d6488e2e8f9fe178487571 diff --git a/libbb/unarchive.c b/libbb/unarchive.c index bd10ad9..62ca267 100644 --- a/libbb/unarchive.c +++ b/libbb/unarchive.c @@ -25,6 +25,8 @@ #include #include #include +#include + #include "libbb.h" #define CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY 1 @@ -35,21 +37,11 @@ static char *longname = NULL; static char *linkname = NULL; #endif -extern void seek_sub_file(FILE *src_stream, const int count); -extern char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *file_entry, - const int function, const char *prefix); -extern ssize_t seek_by_read(FILE* fd, size_t len); - - -#ifdef L_archive_offset off_t archive_offset; -#else -extern off_t archive_offset; -#endif -#ifdef L_seek_sub_file #define SEEK_BUF 4096 -ssize_t seek_by_read(FILE* fd, size_t len) +static ssize_t +seek_by_read(FILE* fd, size_t len) { ssize_t cc, total = 0; char buf[SEEK_BUF]; @@ -68,18 +60,20 @@ ssize_t seek_by_read(FILE* fd, size_t len) return total; } -void seek_sub_file(FILE *src_stream, const int count) +static void +seek_sub_file(FILE *fd, const int count) { - /* Try to fseek as faster */ archive_offset += count; - seek_by_read(src_stream, count); + + /* Do not use fseek() on a pipe. It may fail with ESPIPE, leaving the + * stream at an undefined location. + */ + seek_by_read(fd, count); + return; } -#endif - -#ifdef L_extract_archive /* Extract the data postioned at src_stream to either filesystem, stdout or * buffer depending on the value of 'function' which is defined in libbb.h * @@ -92,8 +86,11 @@ void seek_sub_file(FILE *src_stream, const int count) * For this reason if prefix does point to a dir then it must end with a * trailing '/' or else the last dir will be assumed to be the file prefix */ -char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *file_entry, - const int function, const char *prefix) +static char * +extract_archive(FILE *src_stream, FILE *out_stream, + const file_header_t *file_entry, const int function, + const char *prefix, + int *err) { FILE *dst_stream = NULL; char *full_name = NULL; @@ -101,6 +98,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f char *buffer = NULL; struct utimbuf t; + *err = 0; /* prefix doesnt have to be a proper path it may prepend * the filename as well */ @@ -110,9 +108,9 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f char *path = file_entry->name; if (strncmp("./", path, 2) == 0) { path += 2; - if (strlen(path) == 0) { - return(NULL); - } + if (strlen(path) == 0) + /* Do nothing, current dir already exists. */ + return NULL; } full_name = xmalloc(strlen(prefix) + strlen(path) + 1); strcpy(full_name, prefix); @@ -123,15 +121,15 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f strcat(full_link_name, file_entry->link_name); } } else { - full_name = strdup(file_entry->name); + full_name = xstrdup(file_entry->name); if ( file_entry->link_name ) - full_link_name = strdup(file_entry->link_name); + full_link_name = xstrdup(file_entry->link_name); } - if (function & extract_to_stdout) { + if (function & extract_to_stream) { if (S_ISREG(file_entry->mode)) { - copy_file_chunk(src_stream, out_stream, file_entry->size); + *err = copy_file_chunk(src_stream, out_stream, file_entry->size); archive_offset += file_entry->size; } } @@ -155,6 +153,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f } } else { if ((function & extract_quiet) != extract_quiet) { + *err = -1; error_msg("%s not created: newer or same age file exists", file_entry->name); } seek_sub_file(src_stream, file_entry->size); @@ -167,6 +166,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f parent = dirname(buf); if (make_directory (parent, -1, FILEUTILS_RECUR) != 0) { if ((function & extract_quiet) != extract_quiet) { + *err = -1; error_msg("couldn't create leading directories"); } } @@ -177,17 +177,19 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f if (file_entry->link_name) { /* Found a cpio hard link */ if (link(full_link_name, full_name) != 0) { if ((function & extract_quiet) != extract_quiet) { + *err = -1; perror_msg("Cannot link from %s to '%s'", file_entry->name, file_entry->link_name); } } } else { if ((dst_stream = wfopen(full_name, "w")) == NULL) { + *err = -1; seek_sub_file(src_stream, file_entry->size); goto cleanup; } archive_offset += file_entry->size; - copy_file_chunk(src_stream, dst_stream, file_entry->size); + *err = copy_file_chunk(src_stream, dst_stream, file_entry->size); fclose(dst_stream); } break; @@ -195,7 +197,8 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f if (stat_res != 0) { if (mkdir(full_name, file_entry->mode) < 0) { if ((function & extract_quiet) != extract_quiet) { - perror_msg("extract_archive: %s", full_name); + *err = -1; + perror_msg("Cannot make dir %s", full_name); } } } @@ -203,6 +206,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f case S_IFLNK: if (symlink(file_entry->link_name, full_name) < 0) { if ((function & extract_quiet) != extract_quiet) { + *err = -1; perror_msg("Cannot create symlink from %s to '%s'", file_entry->name, file_entry->link_name); } goto cleanup; @@ -214,13 +218,15 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f case S_IFIFO: if (mknod(full_name, file_entry->mode, file_entry->device) == -1) { if ((function & extract_quiet) != extract_quiet) { + *err = -1; perror_msg("Cannot create node %s", file_entry->name); } goto cleanup; } break; default: - perror_msg("Don't know how to handle %s", full_name); + *err = -1; + perror_msg("Don't know how to handle %s", full_name); } @@ -264,25 +270,29 @@ cleanup: if ( full_link_name ) free(full_link_name); - return(buffer); /* Maybe we should say if failed */ + return buffer; } -#endif -#ifdef L_unarchive -char *unarchive(FILE *src_stream, FILE *out_stream, +static char * +unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers)(FILE *), void (*free_headers)(file_header_t *), - const int extract_function, const char *prefix, char **extract_names) + const int extract_function, + const char *prefix, + const char **extract_names, + int *err) { file_header_t *file_entry; int extract_flag; int i; char *buffer = NULL; + *err = 0; + archive_offset = 0; while ((file_entry = get_headers(src_stream)) != NULL) { extract_flag = TRUE; - /* fprintf(stderr, __FUNCTION__ " getting headers\n"); */ + if (extract_names != NULL) { int found_flag = FALSE; for(i = 0; extract_names[i] != 0; i++) { @@ -301,27 +311,29 @@ char *unarchive(FILE *src_stream, FILE *out_stream, extract_flag = FALSE; } } - } if (extract_flag == TRUE) { - /* fprintf(stderr, __FUNCTION__ " extract?\n"); */ - buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix); - /* fprintf(stderr, __FUNCTION__ " extracted\n"); */ + buffer = extract_archive(src_stream, out_stream, + file_entry, extract_function, + prefix, err); + *err = 0; /* XXX: ignore extraction errors */ + if (*err) { + free_headers(file_entry); + break; + } } else { /* seek past the data entry */ seek_sub_file(src_stream, file_entry->size); } free_headers(file_entry); } - /*fprintf(stderr, __FUNCTION__ " goin home\n");*/ - - return(buffer); + + return buffer; } -#endif -#ifdef L_get_header_ar -file_header_t *get_header_ar(FILE *src_stream) +static file_header_t * +get_header_ar(FILE *src_stream) { file_header_t *typed; union { @@ -406,141 +418,23 @@ file_header_t *get_header_ar(FILE *src_stream) return(typed); } -void free_header_ar(file_header_t *ar_entry) +static void +free_header_ar(file_header_t *ar_entry) { - if (ar_entry == NULL) { - return; - } + if (ar_entry == NULL) + return; - free(ar_entry->name); - free(ar_entry->link_name); + free(ar_entry->name); + if (ar_entry->link_name) + free(ar_entry->link_name); - free(ar_entry); + free(ar_entry); } -#endif - -#ifdef L_get_header_cpio -struct hardlinks { - file_header_t *entry; - int inode; - struct hardlinks *next; -}; - -file_header_t *get_header_cpio(FILE *src_stream) -{ - file_header_t *cpio_entry = NULL; - char cpio_header[110]; - int namesize; - char dummy[16]; - int major, minor, nlink, inode; - static struct hardlinks *saved_hardlinks = NULL; - static int pending_hardlinks = 0; - - - if (pending_hardlinks) { /* Deal with any pending hardlinks */ - struct hardlinks *tmp = saved_hardlinks, *oldtmp = NULL; - while (tmp) { - if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */ - cpio_entry = tmp->entry; - if (oldtmp) oldtmp->next = tmp->next; /* Remove item from linked list */ - else saved_hardlinks = tmp->next; - free(tmp); - return (cpio_entry); - } - oldtmp = tmp; - tmp = tmp->next; - } - pending_hardlinks = 0; /* No more pending hardlinks, read next file entry */ - } - - /* There can be padding before archive header */ - seek_sub_file(src_stream, (4 - (archive_offset % 4)) % 4); - if (fread(cpio_header, 1, 110, src_stream) == 110) { - archive_offset += 110; - if (strncmp(cpio_header, "07070", 5) != 0) { - error_msg("Unsupported format or invalid magic"); - return(NULL); - } - switch (cpio_header[5]) { - case '2': /* "crc" header format */ - /* Doesnt do the crc check yet */ - case '1': /* "newc" header format */ - cpio_entry = (file_header_t *) xcalloc(1, sizeof(file_header_t)); - sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c", - dummy, &inode, (unsigned int*)&cpio_entry->mode, - (unsigned int*)&cpio_entry->uid, (unsigned int*)&cpio_entry->gid, - &nlink, &cpio_entry->mtime, (unsigned long*)&cpio_entry->size, - dummy, &major, &minor, &namesize, dummy); - - cpio_entry->name = (char *) xcalloc(1, namesize); - fread(cpio_entry->name, 1, namesize, src_stream); /* Read in filename */ - archive_offset += namesize; - /* Skip padding before file contents */ - seek_sub_file(src_stream, (4 - (archive_offset % 4)) % 4); - if (strcmp(cpio_entry->name, "TRAILER!!!") == 0) { - printf("%d blocks\n", (int) (archive_offset % 512 ? (archive_offset / 512) + 1 : archive_offset / 512)); /* Always round up */ - if (saved_hardlinks) { /* Bummer - we still have unresolved hardlinks */ - struct hardlinks *tmp = saved_hardlinks, *oldtmp = NULL; - while (tmp) { - error_msg("%s not created: cannot resolve hardlink", tmp->entry->name); - oldtmp = tmp; - tmp = tmp->next; - free (oldtmp->entry->name); - free (oldtmp->entry); - free (oldtmp); - } - saved_hardlinks = NULL; - pending_hardlinks = 0; - } - return(NULL); - } - if (S_ISLNK(cpio_entry->mode)) { - cpio_entry->link_name = (char *) xcalloc(1, cpio_entry->size + 1); - fread(cpio_entry->link_name, 1, cpio_entry->size, src_stream); - archive_offset += cpio_entry->size; - cpio_entry->size = 0; /* Stop possiable seeks in future */ - } - if (nlink > 1 && !S_ISDIR(cpio_entry->mode)) { - if (cpio_entry->size == 0) { /* Put file on a linked list for later */ - struct hardlinks *new = xmalloc(sizeof(struct hardlinks)); - new->next = saved_hardlinks; - new->inode = inode; - new->entry = cpio_entry; - saved_hardlinks = new; - return(get_header_cpio(src_stream)); /* Recurse to next file */ - } else { /* Found the file with data in */ - struct hardlinks *tmp = saved_hardlinks; - pending_hardlinks = 1; - while (tmp) { - if (tmp->inode == inode) { - tmp->entry->link_name = xstrdup(cpio_entry->name); - nlink--; - } - tmp = tmp->next; - } - if (nlink > 1) error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?"); - } - } - cpio_entry->device = (major << 8) | minor; - break; - default: - error_msg("Unsupported format"); - return(NULL); - } - if (ferror(src_stream) || feof(src_stream)) { - perror_msg("Stream error"); - return(NULL); - } - } - return(cpio_entry); -} -#endif -#ifdef L_get_header_tar -file_header_t *get_header_tar(FILE *tar_stream) +static file_header_t * +get_header_tar(FILE *tar_stream) { - union { unsigned char raw[512]; struct { @@ -711,32 +605,33 @@ file_header_t *get_header_tar(FILE *tar_stream) return(tar_entry); } -void free_header_tar(file_header_t *tar_entry) +static void +free_header_tar(file_header_t *tar_entry) { - if (tar_entry == NULL) { - return; - } + if (tar_entry == NULL) + return; - free(tar_entry->name); - free(tar_entry->link_name); + free(tar_entry->name); + if (tar_entry->link_name); + free(tar_entry->link_name); - free(tar_entry); + free(tar_entry); } -#endif - -#ifdef L_deb_extract -char *deb_extract(const char *package_filename, FILE *out_stream, - const int extract_function, const char *prefix, const char *filename) +char * +deb_extract(const char *package_filename, FILE *out_stream, + const int extract_function, const char *prefix, + const char *filename, int *err) { FILE *deb_stream = NULL; - FILE *uncompressed_stream = NULL; file_header_t *ar_header = NULL; - char **file_list = NULL; + const char **file_list = NULL; char *output_buffer = NULL; char *ared_file = NULL; char ar_magic[8]; - int gunzip_pid = 0; + int gz_err; + + *err = 0; if (filename != NULL) { file_list = xmalloc(sizeof(char *) * 2); @@ -750,13 +645,16 @@ char *deb_extract(const char *package_filename, FILE *out_stream, else if (extract_function & extract_data_tar_gz) { ared_file = "data.tar.gz"; } else { - fprintf(stderr, "no file specified to extract -- extract_function=%x\n", extract_function); + opkg_msg(ERROR, "Internal error: extract_function=%x\n", + extract_function); + *err = -1; goto cleanup; } /* open the debian package to be worked on */ deb_stream = wfopen(package_filename, "r"); if (deb_stream == NULL) { + *err = -1; goto cleanup; } /* set the buffer size */ @@ -764,27 +662,42 @@ char *deb_extract(const char *package_filename, FILE *out_stream, /* check ar magic */ fread(ar_magic, 1, 8, deb_stream); - /*fprintf(stderr, "deb_extract ar_magic=%08x\n", *(long *)ar_magic);*/ + if (strncmp(ar_magic,"!",7) == 0) { archive_offset = 8; while ((ar_header = get_header_ar(deb_stream)) != NULL) { if (strcmp(ared_file, ar_header->name) == 0) { + int gunzip_pid = 0; + FILE *uncompressed_stream; /* open a stream of decompressed data */ uncompressed_stream = gz_open(deb_stream, &gunzip_pid); if (uncompressed_stream == NULL) { + *err = -1; goto cleanup; } archive_offset = 0; - output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, file_list); + output_buffer = unarchive(uncompressed_stream, + out_stream, get_header_tar, + free_header_tar, + extract_function, prefix, + file_list, err); + fclose(uncompressed_stream); + gz_err = gz_close(gunzip_pid); + if (gz_err) + *err = -1; + free_header_ar(ar_header); + break; + } + if (fseek(deb_stream, ar_header->size, SEEK_CUR) == -1) { + opkg_perror(ERROR, "Couldn't fseek into %s", package_filename); + *err = -1; + free_header_ar(ar_header); + goto cleanup; } - seek_sub_file(deb_stream, ar_header->size); - free (ar_header->name); - free (ar_header); + free_header_ar(ar_header); } - gz_close(gunzip_pid); - fclose(uncompressed_stream); goto cleanup; } else if (strncmp(ar_magic, "\037\213", 2) == 0) { /* it's a gz file, let's assume it's an opkg */ @@ -792,48 +705,62 @@ char *deb_extract(const char *package_filename, FILE *out_stream, FILE *unzipped_opkg_stream; file_header_t *tar_header; archive_offset = 0; - fseek(deb_stream, 0, SEEK_SET); + if (fseek(deb_stream, 0, SEEK_SET) == -1) { + opkg_perror(ERROR, "Couldn't fseek into %s", package_filename); + *err = -1; + goto cleanup; + } unzipped_opkg_stream = gz_open(deb_stream, &unzipped_opkg_pid); if (unzipped_opkg_stream == NULL) { + *err = -1; goto cleanup; } - /*fprintf(stderr, __FUNCTION__ ": processing opkg %s -- ared_file=%s\n", package_filename, ared_file);*/ /* walk through outer tar file to find ared_file */ while ((tar_header = get_header_tar(unzipped_opkg_stream)) != NULL) { int name_offset = 0; if (strncmp(tar_header->name, "./", 2) == 0) name_offset = 2; if (strcmp(ared_file, tar_header->name+name_offset) == 0) { + int gunzip_pid = 0; + FILE *uncompressed_stream; /* open a stream of decompressed data */ uncompressed_stream = gz_open(unzipped_opkg_stream, &gunzip_pid); if (uncompressed_stream == NULL) { + *err = -1; goto cleanup; } archive_offset = 0; - /*fprintf(stderr, __FUNCTION__ ":%d: here -- found file\n", __LINE__);*/ + output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, - file_list); - /*fprintf(stderr, __FUNCTION__ ":%d: unarchive complete\n", __LINE__);*/ + file_list, + err); + free_header_tar(tar_header); - gz_close(gunzip_pid); fclose(uncompressed_stream); + gz_err = gz_close(gunzip_pid); + if (gz_err) + *err = -1; + free_header_tar(tar_header); break; } seek_sub_file(unzipped_opkg_stream, tar_header->size); free_header_tar(tar_header); } - gz_close(unzipped_opkg_pid); fclose(unzipped_opkg_stream); - /*fprintf(stderr, __FUNCTION__ ":%d: done\n", __LINE__);*/ + gz_err = gz_close(unzipped_opkg_pid); + if (gz_err) + *err = -1; + goto cleanup; } else { - error_msg_and_die("invalid magic"); + *err = -1; + error_msg("%s: invalid magic", package_filename); } cleanup: @@ -844,4 +771,3 @@ cleanup: return output_buffer; } -#endif