From 69eab26401db425cf27915a675953e2ac33ee0e5 Mon Sep 17 00:00:00 2001 From: Glenn L McGrath Date: Wed, 25 Sep 2002 03:04:03 +0000 Subject: [PATCH] Remove files made obsolete by new unarchiving code --- archival/libunarchive/deb_extract.c | 84 -------- archival/libunarchive/get_header_cpio.c | 137 ------------ archival/libunarchive/get_header_zip.c | 171 --------------- archival/libunarchive/unarchive.c | 263 ------------------------ 4 files changed, 655 deletions(-) delete mode 100644 archival/libunarchive/deb_extract.c delete mode 100644 archival/libunarchive/get_header_cpio.c delete mode 100644 archival/libunarchive/get_header_zip.c delete mode 100644 archival/libunarchive/unarchive.c diff --git a/archival/libunarchive/deb_extract.c b/archival/libunarchive/deb_extract.c deleted file mode 100644 index b95ac4d1f..000000000 --- a/archival/libunarchive/deb_extract.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include -#include -#include -#include "unarchive.h" -#include "libbb.h" - -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_header_t *ar_header = NULL; - char **file_list = NULL; - char *output_buffer = NULL; - char *ared_file = NULL; - char ar_magic[8]; - int gunzip_pid; - - if (filename != NULL) { - file_list = xmalloc(sizeof(char *) * 2); - file_list[0] = xstrdup(filename); - file_list[1] = NULL; - } - - if (extract_function & extract_control_tar_gz) { - ared_file = xstrdup("control.tar.gz"); - } - else if (extract_function & extract_data_tar_gz) { - ared_file = xstrdup("data.tar.gz"); - } - - /* open the debian package to be worked on */ - deb_stream = wfopen(package_filename, "r"); - if (deb_stream == NULL) { - return(NULL); - } - /* set the buffer size */ - setvbuf(deb_stream, NULL, _IOFBF, 0x8000); - - /* check ar magic */ - fread(ar_magic, 1, 8, deb_stream); - if (strncmp(ar_magic,"!",7) != 0) { - error_msg_and_die("invalid magic"); - } - archive_offset = 8; - - while ((ar_header = get_header_ar(deb_stream)) != NULL) { - if (strcmp(ared_file, ar_header->name) == 0) { - /* open a stream of decompressed data */ - uncompressed_stream = gz_open(deb_stream, &gunzip_pid); - archive_offset = 0; - output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, extract_function, prefix, file_list, NULL); - } - seek_sub_file(deb_stream, ar_header->size); - free(ar_header->name); - free(ar_header); - } - gz_close(gunzip_pid); - fclose(deb_stream); - fclose(uncompressed_stream); - free(ared_file); - if (filename != NULL) { - free(file_list[0]); - free(file_list); - } - return(output_buffer); -} - diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c deleted file mode 100644 index cd48601b6..000000000 --- a/archival/libunarchive/get_header_cpio.c +++ /dev/null @@ -1,137 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include -#include -#include -#include "unarchive.h" -#include "libbb.h" - -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, &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); -} - diff --git a/archival/libunarchive/get_header_zip.c b/archival/libunarchive/get_header_zip.c deleted file mode 100644 index 5fa3a6c8c..000000000 --- a/archival/libunarchive/get_header_zip.c +++ /dev/null @@ -1,171 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * get_header_zip for busybox - * - * Copyright (C) 2001 by Laurence Anderson - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include "unarchive.h" -#include "libbb.h" - -#define ZIP_FILEHEADER_MAGIC 0x04034b50 -#define ZIP_CDS_MAGIC 0x02014b50 -#define ZIP_CDS_END_MAGIC 0x06054b50 -#define ZIP_DD_MAGIC 0x08074b50 - - -enum { - zh_version, - zh_flags, - zh_method, - zh_modtime, - zh_moddate, - zh_crc32, - zh_cmpsize, - zh_ucmpsize, - zh_filename_len, - zh_extra_len -}; - -static const char fail_msg[] = "Invalid file or read error"; - -static int le_read_int(FILE *fp, int n) -{ - int r = 0; - int s = 1; - int c; - - archive_offset += n; - - do { - if ((c = fgetc(fp)) == EOF) { - error_msg_and_die(fail_msg); - } - r += s * c; - s <<= 8; - } while (--n); - - return r; -} - -static void read_header(FILE *fp, int *zh) -{ - static const char s[] = { 2, 2, 2, 2, 2, 4, 4, 4, 2, 2, 0 }; - int i = 0; - - do { - zh[i] = le_read_int(fp, s[i]); - } while (s[++i]); -} - -file_header_t *get_header_zip(FILE *zip_stream) -{ - int zip_header[10]; - file_header_t *zip_entry = NULL; - int magic, tmpmagic; - /* If dd_ahead is true, we didn't know the last extracted file's length. */ - static int dd_ahead = 0; - - magic = le_read_int(zip_stream, 4); - - checkmagic: - switch (magic) { - case ZIP_FILEHEADER_MAGIC: - zip_entry = xcalloc(1, sizeof(file_header_t)); - - read_header(zip_stream, zip_header); - - if (zip_header[zh_method] == 8) { - zip_entry->extract_func = &inflate; - } else if (zip_header[zh_method] != 0) { - error_msg_and_die("Unsupported compression method %d\n", - zip_header[zh_method]); - } - - zip_entry->name = xmalloc(zip_header[zh_filename_len] + 1); - if (!fread(zip_entry->name, zip_header[zh_filename_len], 1, zip_stream)) { - error_msg_and_die(fail_msg); - } - archive_offset += zip_header[zh_filename_len]; - - seek_sub_file(zip_stream, zip_header[zh_extra_len]); - - zip_entry->size = zip_header[zh_cmpsize]; - - zip_entry->mode = S_IFREG | 0777; - - /* Time/Date? */ - - zip_entry->name[zip_header[zh_filename_len]] = 0; - if (*(zip_entry->name + zip_header[zh_filename_len] - 1) == '/') { - /* Files that end in a / are directories */ - /* Remove trailing / so unarchive doesn't get confused */ - *(zip_entry->name + zip_header[zh_filename_len] - 1) = '\0'; - zip_entry->mode ^= S_IFREG; - zip_entry->mode |= S_IFDIR; - } - - if (zip_header[zh_flags] & 0x8) { - /* crc32, and sizes are in the data description _after_ the file */ - if (zip_header[zh_cmpsize] == 0) { - /* As we don't know how long this file it is difficult to skip! - * but it is compressed, so normally its ok */ - dd_ahead = 1; - } - if (zip_header[zh_ucmpsize] != 0) { - /* Humm... we would otherwise skip this twice - not good! */ - dd_ahead = 2; - } - } - break; - - case ZIP_CDS_MAGIC: /* FALLTHRU */ - case ZIP_CDS_END_MAGIC: - return(NULL); - break; - - case ZIP_DD_MAGIC: { - int cmpsize; - seek_sub_file(zip_stream, 4); // Skip crc32 - cmpsize = le_read_int(zip_stream, 4); - if (dd_ahead == 1) archive_offset += cmpsize; - seek_sub_file(zip_stream, 4); // Skip uncompressed size - dd_ahead = 0; - return (get_header_zip(zip_stream)); - break; } - - default: - if (!dd_ahead) error_msg("Invalid magic (%#x): Trying to skip junk", magic); - dd_ahead = 0; - while ((tmpmagic = fgetc(zip_stream)) != EOF) { - archive_offset++; - magic = ((magic >> 8) & 0x00ffffff) | ((tmpmagic << 24) & 0xff000000); - if (magic == ZIP_FILEHEADER_MAGIC - || magic == ZIP_CDS_MAGIC - || magic == ZIP_CDS_END_MAGIC) { - goto checkmagic; - } - } - error_msg_and_die(fail_msg); - } - - return(zip_entry); -} diff --git a/archival/libunarchive/unarchive.c b/archival/libunarchive/unarchive.c deleted file mode 100644 index 03e3c3ec2..000000000 --- a/archival/libunarchive/unarchive.c +++ /dev/null @@ -1,263 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "unarchive.h" -#include "busybox.h" - -/* 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 - * - * prefix doesnt have to be just a directory, it may prefix the filename as well. - * - * e.g. '/var/lib/dpkg/info/dpkg.' will extract all files to the base bath - * '/var/lib/dpkg/info/' and all files/dirs created in that dir will have - * 'dpkg.' as their prefix - * - * 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) -{ - FILE *dst_stream = NULL; - char *full_name = NULL; - char *buffer = NULL; - struct utimbuf t; - - /* prefix doesnt have to be a proper path it may prepend - * the filename as well */ - if (prefix != NULL) { - /* strip leading '/' in filename to extract as prefix may not be dir */ - /* Cant use concat_path_file here as prefix might not be a directory */ - char *path = file_entry->name; - if (strncmp("./", path, 2) == 0) { - path += 2; - if (strlen(path) == 0) { - return(NULL); - } - } - bb_asprintf(&full_name, "%s%s", prefix, path); - } else { - full_name = file_entry->name; - } - if (function & extract_to_stdout) { - if (S_ISREG(file_entry->mode)) { - copy_file_chunk(src_stream, out_stream, file_entry->size); - archive_offset += file_entry->size; - } - } - else if (function & extract_one_to_buffer) { - if (S_ISREG(file_entry->mode)) { - buffer = (char *) xmalloc(file_entry->size + 1); - fread(buffer, 1, file_entry->size, src_stream); - buffer[file_entry->size] = '\0'; - archive_offset += file_entry->size; - return(buffer); - } - } - else if (function & extract_all_to_fs) { - struct stat oldfile; - int stat_res; - stat_res = lstat (full_name, &oldfile); - if (stat_res == 0) { /* The file already exists */ - if ((function & extract_unconditional) || (oldfile.st_mtime < file_entry->mtime)) { - if (!S_ISDIR(oldfile.st_mode)) { - unlink(full_name); /* Directories might not be empty etc */ - } - } else { - if ((function & extract_quiet) != extract_quiet) { - error_msg("%s not created: newer or same age file exists", file_entry->name); - } - seek_sub_file(src_stream, file_entry->size); - return (NULL); - } - } - if (function & extract_create_leading_dirs) { /* Create leading directories with default umask */ - char *buf, *parent; - buf = xstrdup(full_name); - parent = dirname(buf); - if (make_directory (parent, -1, FILEUTILS_RECUR) != 0) { - if ((function & extract_quiet) != extract_quiet) { - error_msg("couldn't create leading directories"); - } - } - free (buf); - } - switch(file_entry->mode & S_IFMT) { - case S_IFREG: - if (file_entry->link_name) { /* Found a cpio hard link */ - if (link(file_entry->link_name, full_name) != 0) { - if ((function & extract_quiet) != extract_quiet) { - perror_msg("Cannot link from %s to '%s'", - file_entry->name, file_entry->link_name); - } - } - } else { - if ((dst_stream = wfopen(full_name, "w")) == NULL) { - seek_sub_file(src_stream, file_entry->size); - return NULL; - } - archive_offset += file_entry->size; - if (file_entry->extract_func) file_entry->extract_func(src_stream, dst_stream); - else copy_file_chunk(src_stream, dst_stream, file_entry->size); - fclose(dst_stream); - } - break; - case S_IFDIR: - 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); - } - } - } - break; - case S_IFLNK: - if (symlink(file_entry->link_name, full_name) < 0) { - if ((function & extract_quiet) != extract_quiet) { - perror_msg("Cannot create symlink from %s to '%s'", file_entry->name, file_entry->link_name); - } - return NULL; - } - break; - case S_IFSOCK: - case S_IFBLK: - case S_IFCHR: - case S_IFIFO: - if (mknod(full_name, file_entry->mode, file_entry->device) == -1) { - if ((function & extract_quiet) != extract_quiet) { - perror_msg("Cannot create node %s", file_entry->name); - } - return NULL; - } - break; - } - - /* Changing a symlink's properties normally changes the properties of the - * file pointed to, so dont try and change the date or mode, lchown does - * does the right thing, but isnt available in older versions of libc */ - if (S_ISLNK(file_entry->mode)) { -#if (__GLIBC__ > 2) && (__GLIBC_MINOR__ > 1) - lchown(full_name, file_entry->uid, file_entry->gid); -#endif - } else { - if (function & extract_preserve_date) { - t.actime = file_entry->mtime; - t.modtime = file_entry->mtime; - utime(full_name, &t); - } - chmod(full_name, file_entry->mode); - chown(full_name, file_entry->uid, file_entry->gid); - } - } else { - /* If we arent extracting data we have to skip it, - * if data size is 0 then then just do it anyway - * (saves testing for it) */ - seek_sub_file(src_stream, file_entry->size); - } - - /* extract_list and extract_verbose_list can be used in conjunction - * with one of the above four extraction functions, so do this seperately */ - if (function & extract_verbose_list) { - fprintf(out_stream, "%s %d/%d %8d %s ", mode_string(file_entry->mode), - file_entry->uid, file_entry->gid, - (int) file_entry->size, time_string(file_entry->mtime)); - } - if ((function & extract_list) || (function & extract_verbose_list)){ - /* fputs doesnt add a trailing \n, so use fprintf */ - fprintf(out_stream, "%s\n", full_name); - } - - if (prefix != NULL) { - free(full_name); - } - - return(NULL); /* Maybe we should say if failed */ -} - -char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers)(FILE *), - const int extract_function, const char *prefix, char **include_name, char **exclude_name) -{ - file_header_t *file_entry; - int extract_flag = TRUE; - int i; - char *buffer = NULL; -#ifdef CONFIG_FEATURE_UNARCHIVE_TAPE - int pid, tape_pipe[2]; - - if (pipe(tape_pipe) != 0) error_msg_and_die("Can't create pipe\n"); - if ((pid = fork()) == -1) error_msg_and_die("Fork failed\n"); - if (pid==0) { /* child process */ - close(tape_pipe[0]); /* We don't wan't to read from the pipe */ - copyfd(fileno(src_stream), tape_pipe[1]); - close(tape_pipe[1]); /* Send EOF */ - exit(0); - /* notreached */ - } - close(tape_pipe[1]); /* Don't want to write down the pipe */ - fclose(src_stream); - src_stream = fdopen(tape_pipe[0], "r"); -#endif - archive_offset = 0; - while ((file_entry = get_headers(src_stream)) != NULL) { - - if (include_name != NULL) { - extract_flag = FALSE; - for(i = 0; include_name[i] != 0; i++) { - if (fnmatch(include_name[i], file_entry->name, FNM_LEADING_DIR) == 0) { - extract_flag = TRUE; - break; - } - } - } else { - extract_flag = TRUE; - } - - /* If the file entry is in the exclude list dont extract it */ - if (exclude_name != NULL) { - for(i = 0; exclude_name[i] != 0; i++) { - if (fnmatch(exclude_name[i], file_entry->name, FNM_LEADING_DIR) == 0) { - extract_flag = FALSE; - break; - } - } - } - - if (extract_flag) { - buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix); - } else { - /* seek past the data entry */ - seek_sub_file(src_stream, file_entry->size); - } - free(file_entry->name); - free(file_entry->link_name); - free(file_entry); - } -#ifdef CONFIG_FEATURE_UNARCHIVE_TAPE - kill(pid, SIGTERM); - waitpid(pid, NULL, 0); -#endif - return(buffer); -} -- 2.25.1