"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Common/libzip/zip_source_filep.c" between
VeraCrypt_1.21_Source.tar.bz2 and VeraCrypt_1.22_Source.tar.bz2

About: VeraCrypt is a free disk encryption software (based on TrueCrypt).

zip_source_filep.c  (VeraCrypt_1.21_Source.tar.bz2):zip_source_filep.c  (VeraCrypt_1.22_Source.tar.bz2)
/* /*
zip_source_filep.c -- create data source from FILE * zip_source_filep.c -- create data source from FILE *
Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
This file is part of libzip, a library to manipulate ZIP archives. This file is part of libzip, a library to manipulate ZIP archives.
The authors can be contacted at <libzip@nih.at> The authors can be contacted at <libzip@nih.at>
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
1. Redistributions of source code must retain the above copyright 1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
skipping to change at line 34 skipping to change at line 34
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include "zipint.h" #include "zipint.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef HAVE_CLONEFILE
#include <sys/attr.h>
#include <sys/clonefile.h>
#define CAN_CLONE
#endif
#ifdef HAVE_FICLONERANGE
#include <linux/fs.h>
#include <sys/ioctl.h>
#define CAN_CLONE
#endif
#ifdef _WIN32 #ifdef _WIN32
/* WIN32 needs <fcntl.h> for _O_BINARY */ /* WIN32 needs <fcntl.h> for _O_BINARY */
#include <fcntl.h> #include <fcntl.h>
#endif #endif
/* Windows sys/types.h does not provide these */ /* Windows sys/types.h does not provide these */
#ifndef S_ISREG #ifndef S_ISREG
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG)
#endif #endif
#if defined(S_IXUSR) && defined(S_IRWXG) && defined(S_IRWXO) #if defined(S_IXUSR) && defined(S_IRWXG) && defined(S_IRWXO)
#define _SAFE_MASK (S_IXUSR | S_IRWXG | S_IRWXO) #define _SAFE_MASK (S_IXUSR | S_IRWXG | S_IRWXO)
#elif defined(_S_IWRITE) #elif defined(_S_IWRITE)
#define _SAFE_MASK (_S_IWRITE) #define _SAFE_MASK (_S_IWRITE)
#else #else
#error do not know safe values for umask, please report this #error do not know safe values for umask, please report this
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
/* MSVC doesn't have mode_t */ /* MSVC doesn't have mode_t */
typedef int mode_t; typedef int mode_t;
#endif #endif
struct read_file { struct read_file {
zip_error_t error; /* last error information */ zip_error_t error; /* last error information */
zip_int64_t supports; zip_int64_t supports;
/* reading */ /* reading */
char *fname; /* name of file to read from */ char *fname; /* name of file to read from */
FILE *f; /* file to read from */ FILE *f; /* file to read from */
struct zip_stat st; /* stat information passed in */ struct zip_stat st; /* stat information passed in */
zip_error_t stat_error; /* error returned for stat */ zip_error_t stat_error; /* error returned for stat */
zip_uint64_t start; /* start offset of data to read */ zip_uint64_t start; /* start offset of data to read */
zip_uint64_t end; /* end offset of data to read relative to start, 0 f or up to EOF */ zip_uint64_t end; /* end offset of data to read relative to start, 0 f or up to EOF */
zip_uint64_t current; /* current offset relative to start (0 is beginning of part we read) */ zip_uint64_t current; /* current offset relative to start (0 is beginning of part we read) */
/* writing */ /* writing */
char *tmpname; char *tmpname;
FILE *fout; FILE *fout;
}; };
static zip_int64_t read_file(void *state, void *data, zip_uint64_t len, zip_sour ce_cmd_t cmd); static zip_int64_t read_file(void *state, void *data, zip_uint64_t len, zip_sour ce_cmd_t cmd);
static int create_temp_output(struct read_file *ctx); static int create_temp_output(struct read_file *ctx);
#ifdef CAN_CLONE
static zip_int64_t create_temp_output_cloning(struct read_file *ctx, zip_uint64_
t offset);
#endif
static int _zip_fseek_u(FILE *f, zip_uint64_t offset, int whence, zip_error_t *e rror); static int _zip_fseek_u(FILE *f, zip_uint64_t offset, int whence, zip_error_t *e rror);
static int _zip_fseek(FILE *f, zip_int64_t offset, int whence, zip_error_t *erro r); static int _zip_fseek(FILE *f, zip_int64_t offset, int whence, zip_error_t *erro r);
ZIP_EXTERN zip_source_t * ZIP_EXTERN zip_source_t *
zip_source_filep(zip_t *za, FILE *file, zip_uint64_t start, zip_int64_t len) zip_source_filep(zip_t *za, FILE *file, zip_uint64_t start, zip_int64_t len) {
{
if (za == NULL) if (za == NULL)
return NULL; return NULL;
return zip_source_filep_create(file, start, len, &za->error); return zip_source_filep_create(file, start, len, &za->error);
} }
ZIP_EXTERN zip_source_t * ZIP_EXTERN zip_source_t *
zip_source_filep_create(FILE *file, zip_uint64_t start, zip_int64_t length, zip_ zip_source_filep_create(FILE *file, zip_uint64_t start, zip_int64_t length, zip_
error_t *error) error_t *error) {
{
if (file == NULL || length < -1) { if (file == NULL || length < -1) {
zip_error_set(error, ZIP_ER_INVAL, 0); zip_error_set(error, ZIP_ER_INVAL, 0);
return NULL; return NULL;
} }
return _zip_source_file_or_p(NULL, file, start, length, NULL, error); return _zip_source_file_or_p(NULL, file, start, length, NULL, error);
} }
zip_source_t * zip_source_t *
_zip_source_file_or_p(const char *fname, FILE *file, zip_uint64_t start, zip_int _zip_source_file_or_p(const char *fname, FILE *file, zip_uint64_t start, zip_int
64_t len, const zip_stat_t *st, zip_error_t *error) 64_t len, const zip_stat_t *st, zip_error_t *error) {
{
struct read_file *ctx; struct read_file *ctx;
zip_source_t *zs; zip_source_t *zs;
struct stat sb;
bool stat_valid;
if (file == NULL && fname == NULL) { if (file == NULL && fname == NULL) {
zip_error_set(error, ZIP_ER_INVAL, 0); zip_error_set(error, ZIP_ER_INVAL, 0);
return NULL; return NULL;
} }
if (len < 0) { if (len < 0) {
len = 0; len = 0;
} }
if (start > ZIP_INT64_MAX || start + (zip_uint64_t)len < start) { if (start > ZIP_INT64_MAX || start + (zip_uint64_t)len < start) {
zip_error_set(error, ZIP_ER_INVAL, 0); zip_error_set(error, ZIP_ER_INVAL, 0);
return NULL; return NULL;
} }
if ((ctx=(struct read_file *)malloc(sizeof(struct read_file))) == NULL) { if ((ctx = (struct read_file *)malloc(sizeof(struct read_file))) == NULL) {
zip_error_set(error, ZIP_ER_MEMORY, 0); zip_error_set(error, ZIP_ER_MEMORY, 0);
return NULL; return NULL;
} }
ctx->fname = NULL; ctx->fname = NULL;
if (fname) { if (fname) {
if ((ctx->fname=strdup(fname)) == NULL) { if ((ctx->fname = strdup(fname)) == NULL) {
zip_error_set(error, ZIP_ER_MEMORY, 0); zip_error_set(error, ZIP_ER_MEMORY, 0);
free(ctx); free(ctx);
return NULL; return NULL;
} }
} }
ctx->f = file; ctx->f = file;
ctx->start = start; ctx->start = start;
ctx->end = (zip_uint64_t)len; ctx->end = (zip_uint64_t)len;
if (st) { if (st) {
memcpy(&ctx->st, st, sizeof(ctx->st)); memcpy(&ctx->st, st, sizeof(ctx->st));
ctx->st.name = NULL; ctx->st.name = NULL;
ctx->st.valid &= ~ZIP_STAT_NAME; ctx->st.valid &= ~ZIP_STAT_NAME;
} }
else { else {
zip_stat_init(&ctx->st); zip_stat_init(&ctx->st);
} }
if (ctx->end > 0) { if (ctx->end > 0) {
ctx->st.size = ctx->end; ctx->st.size = ctx->end;
ctx->st.valid |= ZIP_STAT_SIZE; ctx->st.valid |= ZIP_STAT_SIZE;
} }
zip_error_init(&ctx->stat_error); zip_error_init(&ctx->stat_error);
ctx->tmpname = NULL; ctx->tmpname = NULL;
ctx->fout = NULL; ctx->fout = NULL;
zip_error_init(&ctx->error); zip_error_init(&ctx->error);
ctx->supports = ZIP_SOURCE_SUPPORTS_READABLE | zip_source_make_command_bitma p(ZIP_SOURCE_SUPPORTS, ZIP_SOURCE_TELL, -1); ctx->supports = ZIP_SOURCE_SUPPORTS_READABLE | zip_source_make_command_bitma p(ZIP_SOURCE_SUPPORTS, ZIP_SOURCE_TELL, -1);
if (ctx->fname) { if (ctx->fname) {
struct stat sb; stat_valid = stat(ctx->fname, &sb) >= 0;
if (stat(ctx->fname, &sb) < 0) {
zip_error_set(&ctx->stat_error, ZIP_ER_READ, errno); if (!stat_valid) {
if (ctx->start == 0 && ctx->end == 0) { if (ctx->start == 0 && ctx->end == 0) {
ctx->supports = ZIP_SOURCE_SUPPORTS_WRITABLE; ctx->supports = ZIP_SOURCE_SUPPORTS_WRITABLE;
} }
} }
else { }
if ((ctx->st.valid & ZIP_STAT_MTIME) == 0) { else {
ctx->st.mtime = sb.st_mtime; stat_valid = fstat(fileno(ctx->f), &sb) >= 0;
ctx->st.valid |= ZIP_STAT_MTIME; }
if (!stat_valid) {
zip_error_set(&ctx->stat_error, ZIP_ER_READ, errno);
}
else {
if ((ctx->st.valid & ZIP_STAT_MTIME) == 0) {
ctx->st.mtime = sb.st_mtime;
ctx->st.valid |= ZIP_STAT_MTIME;
}
if (S_ISREG(sb.st_mode)) {
ctx->supports = ZIP_SOURCE_SUPPORTS_SEEKABLE;
if (ctx->start + ctx->end > (zip_uint64_t)sb.st_size) {
zip_error_set(error, ZIP_ER_INVAL, 0);
free(ctx->fname);
free(ctx);
return NULL;
} }
if (S_ISREG(sb.st_mode)) {
ctx->supports = ZIP_SOURCE_SUPPORTS_SEEKABLE;
if (ctx->start + ctx->end > (zip_uint64_t)sb.st_size) { if (ctx->end == 0) {
zip_error_set(error, ZIP_ER_INVAL, 0); ctx->st.size = (zip_uint64_t)sb.st_size - ctx->start;
free(ctx->fname); ctx->st.valid |= ZIP_STAT_SIZE;
free(ctx);
return NULL;
}
if (ctx->end == 0) { if (ctx->fname && start == 0) {
ctx->st.size = (zip_uint64_t)sb.st_size - ctx->start; ctx->supports = ZIP_SOURCE_SUPPORTS_WRITABLE;
ctx->st.valid |= ZIP_STAT_SIZE;
if (start == 0) {
ctx->supports = ZIP_SOURCE_SUPPORTS_WRITABLE;
}
} }
} }
} }
} }
else if (fseeko(ctx->f, 0, SEEK_CUR) == 0) {
ctx->supports = ZIP_SOURCE_SUPPORTS_SEEKABLE; #ifdef CAN_CLONE
if (ctx->supports & ZIP_SOURCE_MAKE_COMMAND_BITMASK(ZIP_SOURCE_BEGIN_WRITE))
{
ctx->supports |= ZIP_SOURCE_MAKE_COMMAND_BITMASK(ZIP_SOURCE_BEGIN_WRITE_C
LONING);
} }
#endif
if ((zs=zip_source_function_create(read_file, ctx, error)) == NULL) { if ((zs = zip_source_function_create(read_file, ctx, error)) == NULL) {
free(ctx->fname); free(ctx->fname);
free(ctx); free(ctx);
return NULL; return NULL;
} }
return zs; return zs;
} }
static int static int
create_temp_output(struct read_file *ctx) create_temp_output(struct read_file *ctx) {
{
char *temp; char *temp;
int tfd; int tfd;
mode_t mask; mode_t mask;
FILE *tfp; FILE *tfp;
if ((temp=(char *)malloc(strlen(ctx->fname)+8)) == NULL) { if ((temp = (char *)malloc(strlen(ctx->fname) + 8)) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_MEMORY, 0); zip_error_set(&ctx->error, ZIP_ER_MEMORY, 0);
return -1; return -1;
} }
sprintf(temp, "%s.XXXXXX", ctx->fname); sprintf(temp, "%s.XXXXXX", ctx->fname);
mask = umask(_SAFE_MASK); mask = umask(_SAFE_MASK);
if ((tfd=mkstemp(temp)) == -1) { if ((tfd = mkstemp(temp)) == -1) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno); zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
umask(mask); umask(mask);
free(temp); free(temp);
return -1; return -1;
} }
umask(mask); umask(mask);
if ((tfp=fdopen(tfd, "r+b")) == NULL) { if ((tfp = fdopen(tfd, "r+b")) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno); zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
close(tfd); close(tfd);
(void)remove(temp); (void)remove(temp);
free(temp); free(temp);
return -1; return -1;
} }
#ifdef _WIN32 #ifdef _WIN32
/* /*
According to Pierre Joye, Windows in some environments per According to Pierre Joye, Windows in some environments per
default creates text files, so force binary mode. default creates text files, so force binary mode.
*/ */
_setmode(_fileno(tfp), _O_BINARY ); _setmode(_fileno(tfp), _O_BINARY);
#endif
ctx->fout = tfp;
ctx->tmpname = temp;
return 0;
}
#ifdef CAN_CLONE
zip_int64_t static create_temp_output_cloning(struct read_file *ctx, zip_uint64_
t offset) {
char *temp;
FILE *tfp;
if (offset > ZIP_OFF_MAX) {
zip_error_set(&ctx->error, ZIP_ER_SEEK, E2BIG);
return -1;
}
if ((temp = (char *)malloc(strlen(ctx->fname) + 8)) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_MEMORY, 0);
return -1;
}
sprintf(temp, "%s.XXXXXX", ctx->fname);
#ifdef HAVE_CLONEFILE
#ifndef __clang_analyzer__
/* we can't use mkstemp, since clonefile insists on creating the file */
if (mktemp(temp) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
free(temp);
return -1;
}
#endif
if (clonefile(ctx->fname, temp, 0) < 0) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
free(temp);
return -1;
}
if ((tfp = fopen(temp, "r+b")) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
(void)remove(temp);
free(temp);
return -1;
}
#else
{
int fd;
struct file_clone_range range;
struct stat st;
if (fstat(fileno(ctx->f), &st) < 0) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
return -1;
}
if ((fd = mkstemp(temp)) < 0) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
free(temp);
return -1;
}
range.src_fd = fileno(ctx->f);
range.src_offset = 0;
range.src_length = ((offset + st.st_blksize - 1) / st.st_blksize) * st.st
_blksize;
if (range.src_length > st.st_size) {
range.src_length = 0;
}
range.dest_offset = 0;
if (ioctl(fd, FICLONERANGE, &range) < 0) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
(void)close(fd);
(void)remove(temp);
free(temp);
return -1;
}
if ((tfp = fdopen(fd, "r+b")) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
(void)close(fd);
(void)remove(temp);
free(temp);
return -1;
}
}
#endif #endif
if (ftruncate(fileno(tfp), (off_t)offset) < 0) {
(void)fclose(tfp);
(void)remove(temp);
free(temp);
return -1;
}
if (fseeko(tfp, (off_t)offset, SEEK_SET) < 0) {
(void)fclose(tfp);
(void)remove(temp);
free(temp);
zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
}
ctx->fout = tfp; ctx->fout = tfp;
ctx->tmpname = temp; ctx->tmpname = temp;
return 0; return 0;
} }
#endif
static zip_int64_t static zip_int64_t
read_file(void *state, void *data, zip_uint64_t len, zip_source_cmd_t cmd) read_file(void *state, void *data, zip_uint64_t len, zip_source_cmd_t cmd) {
{
struct read_file *ctx; struct read_file *ctx;
char *buf; char *buf;
zip_uint64_t n; zip_uint64_t n;
size_t i; size_t i;
ctx = (struct read_file *)state; ctx = (struct read_file *)state;
buf = (char *)data; buf = (char *)data;
switch (cmd) { switch (cmd) {
case ZIP_SOURCE_BEGIN_WRITE: case ZIP_SOURCE_BEGIN_WRITE:
if (ctx->fname == NULL) { if (ctx->fname == NULL) {
zip_error_set(&ctx->error, ZIP_ER_OPNOTSUPP, 0); zip_error_set(&ctx->error, ZIP_ER_OPNOTSUPP, 0);
return -1; return -1;
} }
return create_temp_output(ctx); return create_temp_output(ctx);
case ZIP_SOURCE_COMMIT_WRITE: {
mode_t mask;
if (fclose(ctx->fout) < 0) {
ctx->fout = NULL;
zip_error_set(&ctx->error, ZIP_ER_WRITE, errno);
}
ctx->fout = NULL;
if (rename(ctx->tmpname, ctx->fname) < 0) {
zip_error_set(&ctx->error, ZIP_ER_RENAME, errno);
return -1;
}
mask = umask(022);
umask(mask);
/* not much we can do if chmod fails except make the whole commit fai
l */
(void)chmod(ctx->fname, 0666&~mask);
free(ctx->tmpname);
ctx->tmpname = NULL;
return 0;
}
case ZIP_SOURCE_CLOSE:
if (ctx->fname) {
fclose(ctx->f);
ctx->f = NULL;
}
return 0;
case ZIP_SOURCE_ERROR:
return zip_error_to_data(&ctx->error, data, len);
case ZIP_SOURCE_FREE:
free(ctx->fname);
free(ctx->tmpname);
if (ctx->f)
fclose(ctx->f);
free(ctx);
return 0;
case ZIP_SOURCE_OPEN:
if (ctx->fname) {
if ((ctx->f=fopen(ctx->fname, "rb")) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_OPEN, errno);
return -1;
}
}
if (ctx->start > 0) {
if (_zip_fseek_u(ctx->f, ctx->start, SEEK_SET, &ctx->error) < 0)
{
/* TODO: skip by reading */
return -1;
}
}
ctx->current = 0;
return 0;
case ZIP_SOURCE_READ:
if (ctx->end > 0) {
n = ctx->end - ctx->current;
if (n > len) {
n = len;
}
}
else {
n = len;
}
if (n > SIZE_MAX)
n = SIZE_MAX;
if ((i=fread(buf, 1, (size_t)n, ctx->f)) == 0) {
if (ferror(ctx->f)) {
zip_error_set(&ctx->error, ZIP_ER_READ, errno);
return -1;
}
}
ctx->current += i;
return (zip_int64_t)i;
case ZIP_SOURCE_REMOVE:
if (remove(ctx->fname) < 0) {
zip_error_set(&ctx->error, ZIP_ER_REMOVE, errno);
return -1;
}
return 0;
case ZIP_SOURCE_ROLLBACK_WRITE:
if (ctx->fout) {
fclose(ctx->fout);
ctx->fout = NULL;
}
(void)remove(ctx->tmpname);
free(ctx->tmpname);
ctx->tmpname = NULL;
return 0;
case ZIP_SOURCE_SEEK: {
zip_int64_t new_current;
int need_seek;
zip_source_args_seek_t *args = ZIP_SOURCE_GET_ARGS(zip_source_args_se
ek_t, data, len, &ctx->error);
if (args == NULL) #ifdef CAN_CLONE
case ZIP_SOURCE_BEGIN_WRITE_CLONING:
if (ctx->fname == NULL) {
zip_error_set(&ctx->error, ZIP_ER_OPNOTSUPP, 0);
return -1;
}
return create_temp_output_cloning(ctx, len);
#endif
case ZIP_SOURCE_COMMIT_WRITE: {
mode_t mask;
if (fclose(ctx->fout) < 0) {
ctx->fout = NULL;
zip_error_set(&ctx->error, ZIP_ER_WRITE, errno);
}
ctx->fout = NULL;
if (rename(ctx->tmpname, ctx->fname) < 0) {
zip_error_set(&ctx->error, ZIP_ER_RENAME, errno);
return -1;
}
mask = umask(022);
umask(mask);
/* not much we can do if chmod fails except make the whole commit fail */
(void)chmod(ctx->fname, 0666 & ~mask);
free(ctx->tmpname);
ctx->tmpname = NULL;
return 0;
}
case ZIP_SOURCE_CLOSE:
if (ctx->fname) {
fclose(ctx->f);
ctx->f = NULL;
}
return 0;
case ZIP_SOURCE_ERROR:
return zip_error_to_data(&ctx->error, data, len);
case ZIP_SOURCE_FREE:
free(ctx->fname);
free(ctx->tmpname);
if (ctx->f)
fclose(ctx->f);
free(ctx);
return 0;
case ZIP_SOURCE_OPEN:
if (ctx->fname) {
if ((ctx->f = fopen(ctx->fname, "rb")) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_OPEN, errno);
return -1;
}
}
if (ctx->start > 0) {
if (_zip_fseek_u(ctx->f, ctx->start, SEEK_SET, &ctx->error) < 0) {
/* TODO: skip by reading */
return -1; return -1;
}
}
ctx->current = 0;
return 0;
need_seek = 1; case ZIP_SOURCE_READ:
if (ctx->end > 0) {
n = ctx->end - ctx->current;
if (n > len) {
n = len;
}
}
else {
n = len;
}
switch (args->whence) { if (n > SIZE_MAX)
case SEEK_SET: n = SIZE_MAX;
new_current = args->offset;
break;
case SEEK_END:
if (ctx->end == 0) {
if (_zip_fseek(ctx->f, args->offset, SEEK_END, &ctx->err
or) < 0) {
return -1;
}
if ((new_current = ftello(ctx->f)) < 0) {
zip_error_set(&ctx->error, ZIP_ER_SEEK, errno);
return -1;
}
new_current -= (zip_int64_t)ctx->start;
need_seek = 0;
}
else {
new_current = (zip_int64_t)ctx->end + args->offset;
}
break;
case SEEK_CUR:
new_current = (zip_int64_t)ctx->current + args->offset;
break;
default:
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
}
if (new_current < 0 || (ctx->end != 0 && (zip_uint64_t)new_current >
ctx->end)
|| (zip_uint64_t)new_current + ctx->start < ctx->start) {
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
}
ctx->current = (zip_uint64_t)new_current;
if (need_seek) {
if (_zip_fseek_u(ctx->f, ctx->current + ctx->start, SEEK_SET, &c
tx->error) < 0) {
return -1;
}
}
return 0;
}
case ZIP_SOURCE_SEEK_WRITE: {
zip_source_args_seek_t *args;
args = ZIP_SOURCE_GET_ARGS(zip_source_args_seek_t, data, len, &ctx->
error);
if (args == NULL) {
return -1;
}
if (_zip_fseek(ctx->fout, args->offset, args->whence, &ctx->error) <
0) {
return -1;
}
return 0;
}
case ZIP_SOURCE_STAT: { if ((i = fread(buf, 1, (size_t)n, ctx->f)) == 0) {
if (len < sizeof(ctx->st)) if (ferror(ctx->f)) {
zip_error_set(&ctx->error, ZIP_ER_READ, errno);
return -1; return -1;
}
}
ctx->current += i;
return (zip_int64_t)i;
if (zip_error_code_zip(&ctx->stat_error) != 0) { case ZIP_SOURCE_REMOVE:
zip_error_set(&ctx->error, zip_error_code_zip(&ctx->stat_error), if (remove(ctx->fname) < 0) {
zip_error_code_system(&ctx->stat_error)); zip_error_set(&ctx->error, ZIP_ER_REMOVE, errno);
return -1;
}
return 0;
case ZIP_SOURCE_ROLLBACK_WRITE:
if (ctx->fout) {
fclose(ctx->fout);
ctx->fout = NULL;
}
(void)remove(ctx->tmpname);
free(ctx->tmpname);
ctx->tmpname = NULL;
return 0;
case ZIP_SOURCE_SEEK: {
zip_int64_t new_current;
int need_seek;
zip_source_args_seek_t *args = ZIP_SOURCE_GET_ARGS(zip_source_args_seek_t
, data, len, &ctx->error);
if (args == NULL)
return -1;
need_seek = 1;
switch (args->whence) {
case SEEK_SET:
new_current = args->offset;
break;
case SEEK_END:
if (ctx->end == 0) {
if (_zip_fseek(ctx->f, args->offset, SEEK_END, &ctx->error) < 0)
{
return -1;
}
if ((new_current = ftello(ctx->f)) < 0) {
zip_error_set(&ctx->error, ZIP_ER_SEEK, errno);
return -1;
}
new_current -= (zip_int64_t)ctx->start;
need_seek = 0;
}
else {
new_current = (zip_int64_t)ctx->end + args->offset;
}
break;
case SEEK_CUR:
new_current = (zip_int64_t)ctx->current + args->offset;
break;
default:
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
}
if (new_current < 0 || (ctx->end != 0 && (zip_uint64_t)new_current > ctx-
>end) || (zip_uint64_t)new_current + ctx->start < ctx->start) {
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
}
ctx->current = (zip_uint64_t)new_current;
if (need_seek) {
if (_zip_fseek_u(ctx->f, ctx->current + ctx->start, SEEK_SET, &ctx->e
rror) < 0) {
return -1; return -1;
} }
}
return 0;
}
case ZIP_SOURCE_SEEK_WRITE: {
zip_source_args_seek_t *args;
memcpy(data, &ctx->st, sizeof(ctx->st)); args = ZIP_SOURCE_GET_ARGS(zip_source_args_seek_t, data, len, &ctx->error
return sizeof(ctx->st); );
if (args == NULL) {
return -1;
} }
case ZIP_SOURCE_SUPPORTS: if (_zip_fseek(ctx->fout, args->offset, args->whence, &ctx->error) < 0) {
return ctx->supports; return -1;
}
return 0;
}
case ZIP_SOURCE_TELL: case ZIP_SOURCE_STAT: {
return (zip_int64_t)ctx->current; if (len < sizeof(ctx->st))
return -1;
case ZIP_SOURCE_TELL_WRITE:
{ if (zip_error_code_zip(&ctx->stat_error) != 0) {
off_t ret = ftello(ctx->fout); zip_error_set(&ctx->error, zip_error_code_zip(&ctx->stat_error), zip_
error_code_system(&ctx->stat_error));
if (ret < 0) { return -1;
zip_error_set(&ctx->error, ZIP_ER_TELL, errno); }
return -1;
} memcpy(data, &ctx->st, sizeof(ctx->st));
return ret; return sizeof(ctx->st);
} }
case ZIP_SOURCE_WRITE: case ZIP_SOURCE_SUPPORTS:
{ return ctx->supports;
size_t ret;
case ZIP_SOURCE_TELL:
clearerr(ctx->fout); return (zip_int64_t)ctx->current;
ret = fwrite(data, 1, len, ctx->fout);
if (ret != len || ferror(ctx->fout)) { case ZIP_SOURCE_TELL_WRITE: {
zip_error_set(&ctx->error, ZIP_ER_WRITE, errno); off_t ret = ftello(ctx->fout);
return -1;
} if (ret < 0) {
zip_error_set(&ctx->error, ZIP_ER_TELL, errno);
return (zip_int64_t)ret; return -1;
} }
return ret;
default: }
zip_error_set(&ctx->error, ZIP_ER_OPNOTSUPP, 0);
return -1; case ZIP_SOURCE_WRITE: {
size_t ret;
clearerr(ctx->fout);
ret = fwrite(data, 1, len, ctx->fout);
if (ret != len || ferror(ctx->fout)) {
zip_error_set(&ctx->error, ZIP_ER_WRITE, errno);
return -1;
}
return (zip_int64_t)ret;
}
default:
zip_error_set(&ctx->error, ZIP_ER_OPNOTSUPP, 0);
return -1;
} }
} }
static int static int
_zip_fseek_u(FILE *f, zip_uint64_t offset, int whence, zip_error_t *error) _zip_fseek_u(FILE *f, zip_uint64_t offset, int whence, zip_error_t *error) {
{
if (offset > ZIP_INT64_MAX) { if (offset > ZIP_INT64_MAX) {
zip_error_set(error, ZIP_ER_SEEK, EOVERFLOW); zip_error_set(error, ZIP_ER_SEEK, EOVERFLOW);
return -1; return -1;
} }
return _zip_fseek(f, (zip_int64_t)offset, whence, error); return _zip_fseek(f, (zip_int64_t)offset, whence, error);
} }
static int static int
_zip_fseek(FILE *f, zip_int64_t offset, int whence, zip_error_t *error) _zip_fseek(FILE *f, zip_int64_t offset, int whence, zip_error_t *error) {
{
if (offset > ZIP_FSEEK_MAX || offset < ZIP_FSEEK_MIN) { if (offset > ZIP_FSEEK_MAX || offset < ZIP_FSEEK_MIN) {
zip_error_set(error, ZIP_ER_SEEK, EOVERFLOW); zip_error_set(error, ZIP_ER_SEEK, EOVERFLOW);
return -1; return -1;
} }
if (fseeko(f, (off_t)offset, whence) < 0) { if (fseeko(f, (off_t)offset, whence) < 0) {
zip_error_set(error, ZIP_ER_SEEK, errno); zip_error_set(error, ZIP_ER_SEEK, errno);
return -1; return -1;
} }
return 0; return 0;
} }
 End of changes. 45 change blocks. 
279 lines changed or deleted 405 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)