a24d28f8e3
feedback, but the 2.5 branch is shaping up nicely.) In addition to many small bug fixes and code improvements: * Another iteration of versioning; I think I've got it right now. * Portability: A lot of progress on Windows support (though I'm not committing all of the Windows support files to FreeBSD CVS) * Explicit tracking of MBS, WCS, and UTF-8 versions of strings in archive_entry; the archive_entry routines now correctly return NULL only when something is unset, setting NULL properly clears string values. Most charset conversions have been pushed down to archive_string. * Better handling of charset conversion failure when writing or reading UTF-8 headers in pax archives * archive_entry_linkify() provides multiple strategies for hardlink matching to suit different format expectations * More accurate bzip2 format detection * Joerg Sonnenberger's extensive improvements to mtree support * Rough support for self-extracting ZIP archives. Not an ideal approach, but it works for the archives I've tried. * New "sparsify" option in archive_write_disk converts blocks of nulls into seeks. * Better default behavior for the test harness; it now reports all failures by default instead of coredumping at the first one.
183 lines
5.1 KiB
C
183 lines
5.1 KiB
C
/*-
|
|
* Copyright (c) 2003-2007 Tim Kientzle
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "archive_platform.h"
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_ERRNO_H
|
|
#include <errno.h>
|
|
#endif
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
#ifdef HAVE_STRING_H
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "archive.h"
|
|
#include "archive_private.h"
|
|
#include "archive_read_private.h"
|
|
#include "archive_write_disk_private.h"
|
|
|
|
struct extract {
|
|
struct archive *ad; /* archive_write_disk object */
|
|
|
|
/* Progress function invoked during extract. */
|
|
void (*extract_progress)(void *);
|
|
void *extract_progress_user_data;
|
|
};
|
|
|
|
static int archive_read_extract_cleanup(struct archive_read *);
|
|
static int copy_data(struct archive *ar, struct archive *aw);
|
|
static struct extract *get_extract(struct archive_read *);
|
|
|
|
static struct extract *
|
|
get_extract(struct archive_read *a)
|
|
{
|
|
/* If we haven't initialized, do it now. */
|
|
/* This also sets up a lot of global state. */
|
|
if (a->extract == NULL) {
|
|
a->extract = (struct extract *)malloc(sizeof(*a->extract));
|
|
if (a->extract == NULL) {
|
|
archive_set_error(&a->archive, ENOMEM, "Can't extract");
|
|
return (NULL);
|
|
}
|
|
memset(a->extract, 0, sizeof(*a->extract));
|
|
a->extract->ad = archive_write_disk_new();
|
|
if (a->extract->ad == NULL) {
|
|
archive_set_error(&a->archive, ENOMEM, "Can't extract");
|
|
return (NULL);
|
|
}
|
|
archive_write_disk_set_standard_lookup(a->extract->ad);
|
|
a->cleanup_archive_extract = archive_read_extract_cleanup;
|
|
}
|
|
return (a->extract);
|
|
}
|
|
|
|
int
|
|
archive_read_extract(struct archive *_a, struct archive_entry *entry, int flags)
|
|
{
|
|
struct extract *extract;
|
|
|
|
extract = get_extract((struct archive_read *)_a);
|
|
if (extract == NULL)
|
|
return (ARCHIVE_FATAL);
|
|
archive_write_disk_set_options(extract->ad, flags);
|
|
return (archive_read_extract2(_a, entry, extract->ad));
|
|
}
|
|
|
|
int
|
|
archive_read_extract2(struct archive *_a, struct archive_entry *entry,
|
|
struct archive *ad)
|
|
{
|
|
struct archive_read *a = (struct archive_read *)_a;
|
|
int r, r2;
|
|
|
|
/* Set up for this particular entry. */
|
|
archive_write_disk_set_skip_file(ad,
|
|
a->skip_file_dev, a->skip_file_ino);
|
|
r = archive_write_header(ad, entry);
|
|
if (r < ARCHIVE_WARN)
|
|
r = ARCHIVE_WARN;
|
|
if (r != ARCHIVE_OK)
|
|
/* If _write_header failed, copy the error. */
|
|
archive_copy_error(&a->archive, ad);
|
|
else
|
|
/* Otherwise, pour data into the entry. */
|
|
r = copy_data(_a, ad);
|
|
r2 = archive_write_finish_entry(ad);
|
|
if (r2 < ARCHIVE_WARN)
|
|
r2 = ARCHIVE_WARN;
|
|
/* Use the first message. */
|
|
if (r2 != ARCHIVE_OK && r == ARCHIVE_OK)
|
|
archive_copy_error(&a->archive, ad);
|
|
/* Use the worst error return. */
|
|
if (r2 < r)
|
|
r = r2;
|
|
return (r);
|
|
}
|
|
|
|
void
|
|
archive_read_extract_set_progress_callback(struct archive *_a,
|
|
void (*progress_func)(void *), void *user_data)
|
|
{
|
|
struct archive_read *a = (struct archive_read *)_a;
|
|
struct extract *extract = get_extract(a);
|
|
if (extract != NULL) {
|
|
extract->extract_progress = progress_func;
|
|
extract->extract_progress_user_data = user_data;
|
|
}
|
|
}
|
|
|
|
static int
|
|
copy_data(struct archive *ar, struct archive *aw)
|
|
{
|
|
off_t offset;
|
|
const void *buff;
|
|
struct extract *extract;
|
|
size_t size;
|
|
int r;
|
|
|
|
extract = get_extract((struct archive_read *)ar);
|
|
for (;;) {
|
|
r = archive_read_data_block(ar, &buff, &size, &offset);
|
|
if (r == ARCHIVE_EOF)
|
|
return (ARCHIVE_OK);
|
|
if (r != ARCHIVE_OK)
|
|
return (r);
|
|
r = archive_write_data_block(aw, buff, size, offset);
|
|
if (r < ARCHIVE_WARN)
|
|
r = ARCHIVE_WARN;
|
|
if (r != ARCHIVE_OK) {
|
|
archive_set_error(ar, archive_errno(aw),
|
|
"%s", archive_error_string(aw));
|
|
return (r);
|
|
}
|
|
if (extract->extract_progress)
|
|
(extract->extract_progress)
|
|
(extract->extract_progress_user_data);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Cleanup function for archive_extract.
|
|
*/
|
|
static int
|
|
archive_read_extract_cleanup(struct archive_read *a)
|
|
{
|
|
int ret = ARCHIVE_OK;
|
|
|
|
#if ARCHIVE_API_VERSION > 1
|
|
ret =
|
|
#endif
|
|
archive_write_finish(a->extract->ad);
|
|
free(a->extract);
|
|
a->extract = NULL;
|
|
return (ret);
|
|
}
|