8c6b56d4f6
the following: * License updates. * Fixes for FreeBSD/arm * New read_open_filename, read_open_memory * New write_open_filename, write_open_memory * Write-blocking cleanup (cperciva@) * Adjust API so read_open/write_open funcs only need public API * Portability improvements (casts, include guards, etc.) * Properly pad sparse archive entries with blocks of zero bytes (cperciva@) * Correct copy of data to file when very large reads are possible * Be more flexible about dir permissions to avoid some fixups * Correct skip handling for entries over 2G (cperciva@) * ISO9660: skip entries faster, support entries over 2G * Tar: correct position accounting when skipping large entries (cperciva@) * Support unbuffered write as a special case (blocksize=0) (cperciva@) * Documentation corrections, improvements * Spelling corrections (cperciva@) * Improve some internal error returns A few of these changes break the API/ABI and are therefore conditional on the version number. FreeBSD 6 will continue to use libarchive 1.x, which will continue to use the old API/ABI. When all of these changes are ready, the libarchive version number will be changed in -CURRENT to enable the new API. Hopefully, this will allow the actual source to remain identical between FreeBSD 6 and 7; only the version parameters in the Makefile will be different.
133 lines
3.7 KiB
C
133 lines
3.7 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_STAT_H
|
|
#include <sys/stat.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
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "archive.h"
|
|
|
|
struct write_fd_data {
|
|
off_t offset;
|
|
int fd;
|
|
};
|
|
|
|
static int file_close(struct archive *, void *);
|
|
static int file_open(struct archive *, void *);
|
|
static ssize_t file_write(struct archive *, void *, const void *buff, size_t);
|
|
|
|
int
|
|
archive_write_open_fd(struct archive *a, int fd)
|
|
{
|
|
struct write_fd_data *mine;
|
|
|
|
mine = (struct write_fd_data *)malloc(sizeof(*mine));
|
|
if (mine == NULL) {
|
|
archive_set_error(a, ENOMEM, "No memory");
|
|
return (ARCHIVE_FATAL);
|
|
}
|
|
mine->fd = fd;
|
|
return (archive_write_open(a, mine,
|
|
file_open, file_write, file_close));
|
|
}
|
|
|
|
static int
|
|
file_open(struct archive *a, void *client_data)
|
|
{
|
|
struct write_fd_data *mine;
|
|
struct stat st;
|
|
|
|
mine = (struct write_fd_data *)client_data;
|
|
|
|
if (fstat(mine->fd, &st) != 0) {
|
|
archive_set_error(a, errno, "Couldn't stat fd %d", mine->fd);
|
|
return (ARCHIVE_FATAL);
|
|
}
|
|
|
|
/*
|
|
* If this is a regular file, don't add it to itself.
|
|
*/
|
|
if (S_ISREG(st.st_mode))
|
|
archive_write_set_skip_file(a, st.st_dev, st.st_ino);
|
|
|
|
/*
|
|
* If client hasn't explicitly set the last block handling,
|
|
* then set it here.
|
|
*/
|
|
if (archive_write_get_bytes_in_last_block(a) < 0) {
|
|
/* If the output is a block or character device, fifo,
|
|
* or stdout, pad the last block, otherwise leave it
|
|
* unpadded. */
|
|
if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode) ||
|
|
S_ISFIFO(st.st_mode) || (mine->fd == 1))
|
|
/* Last block will be fully padded. */
|
|
archive_write_set_bytes_in_last_block(a, 0);
|
|
else
|
|
archive_write_set_bytes_in_last_block(a, 1);
|
|
}
|
|
|
|
return (ARCHIVE_OK);
|
|
}
|
|
|
|
static ssize_t
|
|
file_write(struct archive *a, void *client_data, const void *buff, size_t length)
|
|
{
|
|
struct write_fd_data *mine;
|
|
ssize_t bytesWritten;
|
|
|
|
mine = (struct write_fd_data *)client_data;
|
|
bytesWritten = write(mine->fd, buff, length);
|
|
if (bytesWritten <= 0) {
|
|
archive_set_error(a, errno, "Write error");
|
|
return (-1);
|
|
}
|
|
return (bytesWritten);
|
|
}
|
|
|
|
static int
|
|
file_close(struct archive *a, void *client_data)
|
|
{
|
|
struct write_fd_data *mine = (struct write_fd_data *)client_data;
|
|
|
|
(void)a; /* UNUSED */
|
|
free(mine);
|
|
return (ARCHIVE_OK);
|
|
}
|