X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libbb%2Funarchive.c;h=9517e46c8e669a0bb4ca2d50000a2448ddd33415;hp=bb70ccb9532495279dce5870777c0fd40d96c80a;hb=677c7152744313ef9b1195862dbf1761b5e3416d;hpb=2c6f8eda7145ce3e8645567aa930b16853770f94 diff --git a/libbb/unarchive.c b/libbb/unarchive.c index bb70ccb..9517e46 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,35 +37,39 @@ 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); +off_t archive_offset; +#define SEEK_BUF 4096 +static ssize_t +seek_by_read(FILE* fd, size_t len) +{ + ssize_t cc, total = 0; + char buf[SEEK_BUF]; -#ifdef L_archive_offset -off_t archive_offset; -#else -extern off_t archive_offset; -#endif + while (len) { + cc = fread(buf, sizeof(buf[0]), + len > SEEK_BUF ? SEEK_BUF : len, + fd); + + total += cc; + len -= cc; + + if(feof(fd) || ferror(fd)) + break; + } + return total; +} -#ifdef L_seek_sub_file -void seek_sub_file(FILE *src_stream, const int count) +static void +seek_sub_file(FILE *src_stream, const int count) { - int i; /* Try to fseek as faster */ archive_offset += count; - if (fseek(src_stream, count, SEEK_CUR) != 0 && errno == ESPIPE) { - for (i = 0; i < count; i++) { - fgetc(src_stream); - } - } + seek_by_read(src_stream, 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 * @@ -76,8 +82,10 @@ 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) { FILE *dst_stream = NULL; char *full_name = NULL; @@ -107,13 +115,13 @@ 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); archive_offset += file_entry->size; @@ -125,7 +133,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f fread(buffer, 1, file_entry->size, src_stream); buffer[file_entry->size] = '\0'; archive_offset += file_entry->size; - return(buffer); + goto cleanup; } } else if (function & extract_all_to_fs) { @@ -142,7 +150,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f error_msg("%s not created: newer or same age file exists", file_entry->name); } seek_sub_file(src_stream, file_entry->size); - return (NULL); + goto cleanup; } } if (function & extract_create_leading_dirs) { /* Create leading directories with default umask */ @@ -168,7 +176,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f } else { if ((dst_stream = wfopen(full_name, "w")) == NULL) { seek_sub_file(src_stream, file_entry->size); - return NULL; + goto cleanup; } archive_offset += file_entry->size; copy_file_chunk(src_stream, dst_stream, file_entry->size); @@ -189,7 +197,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f if ((function & extract_quiet) != extract_quiet) { perror_msg("Cannot create symlink from %s to '%s'", file_entry->name, file_entry->link_name); } - return NULL; + goto cleanup; } break; case S_IFSOCK: @@ -200,7 +208,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f if ((function & extract_quiet) != extract_quiet) { perror_msg("Cannot create node %s", file_entry->name); } - return NULL; + goto cleanup; } break; default: @@ -243,19 +251,21 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f fprintf(out_stream, "%s\n", file_entry->name); } +cleanup: free(full_name); if ( full_link_name ) free(full_link_name); - return(NULL); /* Maybe we should say if failed */ + return(buffer); /* Maybe we should say if failed */ } -#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) { file_header_t *file_entry; int extract_flag; @@ -301,10 +311,9 @@ char *unarchive(FILE *src_stream, FILE *out_stream, 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 { @@ -389,141 +398,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) +static file_header_t * +get_header_tar(FILE *tar_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) -{ - union { unsigned char raw[512]; struct { @@ -600,10 +491,16 @@ file_header_t *get_header_tar(FILE *tar_stream) linkname = NULL; } else #endif - if (tar.formated.prefix[0] == 0) { - tar_entry->name = strdup(tar.formated.name); - } else { - tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name); + { + tar_entry->name = xstrndup(tar.formated.name, 100); + + if (tar.formated.prefix[0]) { + char *temp = tar_entry->name; + char *prefixTemp = xstrndup(tar.formated.prefix, 155); + tar_entry->name = concat_path_file(prefixTemp, temp); + free(temp); + free(prefixTemp); + } } // tar_entry->name = xstrdup(tar.formated.name); @@ -617,8 +514,7 @@ file_header_t *get_header_tar(FILE *tar_stream) tar_entry->gid = strtol(tar.formated.gid, NULL, 8); tar_entry->size = strtol(tar.formated.size, NULL, 8); tar_entry->mtime = strtol(tar.formated.mtime, NULL, 8); - tar_entry->link_name = strlen(tar.formated.linkname) ? - xstrdup(tar.formated.linkname) : NULL; + tar_entry->link_name = *tar.formated.linkname != '\0' ? xstrndup(tar.formated.linkname, 100) : NULL; tar_entry->device = (strtol(tar.formated.devmajor, NULL, 8) << 8) + strtol(tar.formated.devminor, NULL, 8); @@ -689,53 +585,50 @@ 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, +char * +deb_extract(const char *package_filename, FILE *out_stream, const int extract_function, const char *prefix, const char *filename) { - FILE *deb_stream; - FILE *uncompressed_stream = NULL; + FILE *deb_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; if (filename != NULL) { file_list = xmalloc(sizeof(char *) * 2); - file_list[0] = xstrdup(filename); + file_list[0] = filename; file_list[1] = NULL; } if (extract_function & extract_control_tar_gz) { - ared_file = xstrdup("control.tar.gz"); + ared_file = "control.tar.gz"; } else if (extract_function & extract_data_tar_gz) { - ared_file = xstrdup("data.tar.gz"); + ared_file = "data.tar.gz"; } else { fprintf(stderr, "no file specified to extract -- extract_function=%x\n", extract_function); - return NULL; + goto cleanup; } /* open the debian package to be worked on */ deb_stream = wfopen(package_filename, "r"); if (deb_stream == NULL) { - return(NULL); + goto cleanup; } /* set the buffer size */ setvbuf(deb_stream, NULL, _IOFBF, 0x8000); @@ -748,20 +641,25 @@ char *deb_extract(const char *package_filename, FILE *out_stream, 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) { + goto cleanup; + } + archive_offset = 0; output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, file_list); + fclose(uncompressed_stream); + gz_close(gunzip_pid); + free_header_ar(ar_header); + break; } 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(deb_stream); - fclose(uncompressed_stream); - free(ared_file); - return(output_buffer); + goto cleanup; } else if (strncmp(ar_magic, "\037\213", 2) == 0) { /* it's a gz file, let's assume it's an opkg */ int unzipped_opkg_pid; @@ -770,6 +668,9 @@ char *deb_extract(const char *package_filename, FILE *out_stream, archive_offset = 0; fseek(deb_stream, 0, SEEK_SET); unzipped_opkg_stream = gz_open(deb_stream, &unzipped_opkg_pid); + if (unzipped_opkg_stream == NULL) { + 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 */ @@ -778,8 +679,13 @@ char *deb_extract(const char *package_filename, FILE *out_stream, 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) { + goto cleanup; + } archive_offset = 0; /*fprintf(stderr, __FUNCTION__ ":%d: here -- found file\n", __LINE__);*/ output_buffer = unarchive(uncompressed_stream, @@ -791,22 +697,27 @@ char *deb_extract(const char *package_filename, FILE *out_stream, file_list); /*fprintf(stderr, __FUNCTION__ ":%d: unarchive complete\n", __LINE__);*/ free_header_tar(tar_header); - gz_close(gunzip_pid); fclose(uncompressed_stream); + gz_close(gunzip_pid); + 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); - fclose(deb_stream); - free(ared_file); + gz_close(unzipped_opkg_pid); /*fprintf(stderr, __FUNCTION__ ":%d: done\n", __LINE__);*/ - return output_buffer; + goto cleanup; } else { error_msg_and_die("invalid magic"); } +cleanup: + if (deb_stream) + fclose(deb_stream); + if (file_list) + free(file_list); + + return output_buffer; } -#endif