ef0d6eb598
* Disabled shared-library building, as some API breakage is still likely. (I didn't realize it was turned on by default.) If you have an existing /usr/lib/libarchive.so.2, I recommend deleting it. * Pax interchange format now correctly stores and reads UTF8 for extended attributes. In particular, pax format can portably handle arbitrarily long pathnames containing arbitrary characters. * Library compiles cleanly at -O2, -O3, and WARNS=6 on all FreeBSD-CURRENT platforms. * Minor portability improvements inspired by Juergen Lock and Greg Lewis. (Less reliance on stdint.h, isolating of various portability-challenged constructs.) * archive_entry transparently converts multi-byte <-> wide character strings, allowing clients and format handlers to deal with either one, as appropriate. * Support for reading 'L' and 'K' entries in standard tar archives for star compatibility. * Recognize (but don't yet handle) ACL entries from Solaris tar. * Pushed format-specific data for format readers down into format-specific storage and out of library-global storage. This should make it easier to maintain individual formats without mucking with the core library management. * Documentation updates to track the above changes. * Updates to tar.5 to correct a few mistakes and add some additional information about GNU tar and Solaris tar formats. Notes: * The basic 'tar' reader is getting more general; there's not much point in keeping the 'gnutar' reader separate. Merging the two would lose a bunch of duplicate code. * The libc ACL support is looking increasingly inadequate for my needs here. I might need to assemble some fairly significant code for parsing and building ACLs. <sigh>
208 lines
5.5 KiB
C
208 lines
5.5 KiB
C
/*-
|
|
* Copyright (c) 2003-2004 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
|
|
* in this position and unchanged.
|
|
* 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$");
|
|
|
|
/*
|
|
* This file contains the "essential" portions of the write API, that
|
|
* is, stuff that will essentially always be used by any client that
|
|
* actually needs to write a archive. Optional pieces have been, as
|
|
* far as possible, separated out into separate files to reduce
|
|
* needlessly bloating statically-linked clients.
|
|
*/
|
|
|
|
#include <sys/wait.h>
|
|
#ifdef HAVE_DMALLOC
|
|
#include <dmalloc.h>
|
|
#endif
|
|
#include <limits.h>
|
|
#include <paths.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <tar.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
|
|
#include "archive.h"
|
|
#include "archive_private.h"
|
|
|
|
extern char **environ;
|
|
|
|
/*
|
|
* Allocate, initialize and return an archive object.
|
|
*/
|
|
struct archive *
|
|
archive_write_new(void)
|
|
{
|
|
struct archive *a;
|
|
char *nulls;
|
|
|
|
a = malloc(sizeof(*a));
|
|
if (a == NULL)
|
|
return (NULL);
|
|
memset(a, 0, sizeof(*a));
|
|
a->magic = ARCHIVE_WRITE_MAGIC;
|
|
a->user_uid = geteuid();
|
|
a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK;
|
|
a->bytes_in_last_block = -1; /* Default */
|
|
a->state = ARCHIVE_STATE_NEW;
|
|
a->pformat_data = &(a->format_data);
|
|
|
|
/* Initialize a block of nulls for padding purposes. */
|
|
a->null_length = 1024;
|
|
nulls = malloc(a->null_length);
|
|
if (nulls == NULL) {
|
|
free(a);
|
|
return (NULL);
|
|
}
|
|
memset(nulls, 0, a->null_length);
|
|
a->nulls = nulls;
|
|
/*
|
|
* Set default compression, but don't set a default format.
|
|
* Were we to set a default format here, we would force every
|
|
* client to link in support for that format, even if they didn't
|
|
* ever use it.
|
|
*/
|
|
archive_write_set_compression_none(a);
|
|
return (a);
|
|
}
|
|
|
|
|
|
/*
|
|
* Set the block size. Returns 0 if successful.
|
|
*/
|
|
int
|
|
archive_write_set_bytes_per_block(struct archive *a, int bytes_per_block)
|
|
{
|
|
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW);
|
|
a->bytes_per_block = bytes_per_block;
|
|
return (ARCHIVE_OK);
|
|
}
|
|
|
|
|
|
/*
|
|
* Set the size for the last block.
|
|
* Returns 0 if successful.
|
|
*/
|
|
int
|
|
archive_write_set_bytes_in_last_block(struct archive *a, int bytes)
|
|
{
|
|
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY);
|
|
a->bytes_in_last_block = bytes;
|
|
return (ARCHIVE_OK);
|
|
}
|
|
|
|
|
|
/*
|
|
* Open the archive using the current settings.
|
|
*/
|
|
int
|
|
archive_write_open(struct archive *a, void *client_data,
|
|
archive_open_callback *opener, archive_write_callback *writer,
|
|
archive_close_callback *closer)
|
|
{
|
|
int ret;
|
|
|
|
ret = ARCHIVE_OK;
|
|
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW);
|
|
a->state = ARCHIVE_STATE_HEADER;
|
|
a->client_data = client_data;
|
|
a->client_writer = writer;
|
|
a->client_opener = opener;
|
|
a->client_closer = closer;
|
|
ret = (a->compression_init)(a);
|
|
if (a->format_init && ret == ARCHIVE_OK)
|
|
ret = (a->format_init)(a);
|
|
return (ret);
|
|
}
|
|
|
|
|
|
/*
|
|
* Cleanup and free the archive object.
|
|
*
|
|
* Be careful: user might just call write_new and then write_finish.
|
|
* Don't assume we actually wrote anything or performed any non-trivial
|
|
* initialization.
|
|
*/
|
|
void
|
|
archive_write_finish(struct archive *a)
|
|
{
|
|
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY);
|
|
|
|
/* Finish the last entry. */
|
|
if (a->state & ARCHIVE_STATE_DATA)
|
|
((a->format_finish_entry)(a));
|
|
|
|
/* Finish off the archive. */
|
|
if (a->format_finish != NULL)
|
|
(a->format_finish)(a);
|
|
|
|
/* Finish the compression and close the stream. */
|
|
if (a->compression_finish != NULL)
|
|
(a->compression_finish)(a);
|
|
|
|
/* Release various dynamic buffers. */
|
|
free((void *)(uintptr_t)(const void *)a->nulls);
|
|
if (a->extract_mkdirpath.s != NULL)
|
|
free(a->extract_mkdirpath.s);
|
|
free(a);
|
|
}
|
|
|
|
|
|
/*
|
|
* Write the appropriate header.
|
|
*/
|
|
int
|
|
archive_write_header(struct archive *a, struct archive_entry *entry)
|
|
{
|
|
int ret;
|
|
|
|
archive_check_magic(a, ARCHIVE_WRITE_MAGIC,
|
|
ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA);
|
|
|
|
/* Finish last entry. */
|
|
if (a->state & ARCHIVE_STATE_DATA)
|
|
((a->format_finish_entry)(a));
|
|
|
|
/* Format and write header. */
|
|
ret = ((a->format_write_header)(a, entry));
|
|
|
|
a->state = ARCHIVE_STATE_DATA;
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* Note that the compressor is responsible for blocking.
|
|
*/
|
|
int
|
|
archive_write_data(struct archive *a, const void *buff, size_t s)
|
|
{
|
|
archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA);
|
|
return (a->format_write_data(a, buff, s));
|
|
}
|