b837506cbc
Partial merge of 2431 from trunk: Retry writes on EINTR. This should fix the SIGINT handler in bsdtar. Note: The rest of r2431 can't be merged, since it interacts with a big write-side rearchitecture. PR: bin/149409 Reviewed by: kientzle Approved by: re (kib) MFC after: 3 days
110 lines
2.9 KiB
C
110 lines
2.9 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_FCNTL_H
|
|
#include <fcntl.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_FILE_data {
|
|
FILE *f;
|
|
};
|
|
|
|
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_FILE(struct archive *a, FILE *f)
|
|
{
|
|
struct write_FILE_data *mine;
|
|
|
|
mine = (struct write_FILE_data *)malloc(sizeof(*mine));
|
|
if (mine == NULL) {
|
|
archive_set_error(a, ENOMEM, "No memory");
|
|
return (ARCHIVE_FATAL);
|
|
}
|
|
mine->f = f;
|
|
return (archive_write_open(a, mine,
|
|
file_open, file_write, file_close));
|
|
}
|
|
|
|
static int
|
|
file_open(struct archive *a, void *client_data)
|
|
{
|
|
(void)a; /* UNUSED */
|
|
(void)client_data; /* UNUSED */
|
|
|
|
return (ARCHIVE_OK);
|
|
}
|
|
|
|
static ssize_t
|
|
file_write(struct archive *a, void *client_data, const void *buff, size_t length)
|
|
{
|
|
struct write_FILE_data *mine;
|
|
size_t bytesWritten;
|
|
|
|
mine = client_data;
|
|
for (;;) {
|
|
bytesWritten = fwrite(buff, 1, length, mine->f);
|
|
if (bytesWritten <= 0) {
|
|
if (errno == EINTR)
|
|
continue;
|
|
archive_set_error(a, errno, "Write error");
|
|
return (-1);
|
|
}
|
|
return (bytesWritten);
|
|
}
|
|
}
|
|
|
|
static int
|
|
file_close(struct archive *a, void *client_data)
|
|
{
|
|
struct write_FILE_data *mine = client_data;
|
|
|
|
(void)a; /* UNUSED */
|
|
free(mine);
|
|
return (ARCHIVE_OK);
|
|
}
|