Fix remaining bugs, and ensure correct calling sequences for source functions.
All tests (and all ckmame tests) pass.
--HG--
branch : HEAD
diff --git a/lib/zip.h b/lib/zip.h
index 4863e22..dbc719c 100644
--- a/lib/zip.h
+++ b/lib/zip.h
@@ -255,7 +255,7 @@
const char *, int);
ZIP_EXTERN struct zip_source *zip_source_buffer(struct zip *, const void *,
zip_uint64_t, int);
-ZIP_EXTERN int zip_source_close(struct zip_source *);
+ZIP_EXTERN void zip_source_close(struct zip_source *);
ZIP_EXTERN struct zip_source *zip_source_crc(struct zip *, struct zip_source *,
int);
ZIP_EXTERN struct zip_source *zip_source_deflate(struct zip *,
diff --git a/lib/zip_close.c b/lib/zip_close.c
index f6474b9..7e9d187 100644
--- a/lib/zip_close.c
+++ b/lib/zip_close.c
@@ -45,8 +45,7 @@
static int add_data(struct zip *, struct zip_source *, struct zip_dirent *,
FILE *);
static int copy_data(FILE *, off_t, FILE *, struct zip_error *);
-static int copy_source(struct zip *, struct zip_source *, struct zip_stat *,
- FILE *);
+static int copy_source(struct zip *, struct zip_source *, FILE *);
static int write_cdir(struct zip *, struct zip_cdir *, FILE *);
static int _zip_cdir_set_comment(struct zip_cdir *, struct zip *);
static char *_zip_create_temp_output(struct zip *, FILE **);
@@ -318,7 +317,7 @@
add_data(struct zip *za, struct zip_source *src, struct zip_dirent *de,
FILE *ft)
{
- off_t offstart, offend;
+ off_t offstart, offdata, offend;
struct zip_stat st;
struct zip_source *s2;
zip_compression_implementation comp_impl;
@@ -334,6 +333,11 @@
if (_zip_dirent_write(de, ft, 1, &za->error) < 0)
return -1;
+ if ((s2=zip_source_crc(za, src, 0)) == NULL) {
+ zip_source_pop(s2);
+ return -1;
+ }
+
/* XXX: deflate 0-byte files for torrentzip? */
if (((st.valid & ZIP_STAT_COMP_METHOD) == 0
|| st.comp_method == ZIP_CM_STORE)
@@ -342,20 +346,26 @@
if ((comp_impl=zip_get_compression_implementation(ZIP_CM_DEFLATE))
== NULL) {
_zip_error_set(&za->error, ZIP_ER_COMPNOTSUPP, 0);
+ zip_source_pop(s2);
return -1;
}
- if ((s2=comp_impl(za, src, ZIP_CM_DEFLATE, ZIP_CODEC_ENCODE))
+ if ((s2=comp_impl(za, s2, ZIP_CM_DEFLATE, ZIP_CODEC_ENCODE))
== NULL) {
/* XXX: set error? */
- zip_source_free(src);
+ zip_source_pop(s2);
return -1;
}
}
else
s2 = src;
- ret = copy_source(za, s2, &st, ft);
-
+ offdata = ftello(ft);
+
+ ret = copy_source(za, s2, ft);
+
+ if (zip_source_stat(s2, &st) < 0)
+ ret = -1;
+
while (s2 != src) {
if ((s2=zip_source_pop(s2)) == NULL) {
/* XXX: set erorr */
@@ -367,7 +377,6 @@
if (ret < 0)
return -1;
-
offend = ftello(ft);
if (fseeko(ft, offstart, SEEK_SET) < 0) {
@@ -375,12 +384,11 @@
return -1;
}
-
de->last_mod = st.mtime;
de->comp_method = st.comp_method;
de->crc = st.crc;
de->uncomp_size = st.size;
- de->comp_size = st.comp_size;
+ de->comp_size = offend - offdata;
if (zip_get_archive_flag(za, ZIP_AFL_TORRENT, 0))
_zip_dirent_torrent_normalize(de);
@@ -432,8 +440,7 @@
static int
-copy_source(struct zip *za, struct zip_source *src, struct zip_stat *st,
- FILE *ft)
+copy_source(struct zip *za, struct zip_source *src, FILE *ft)
{
char buf[BUFSIZE];
zip_int64_t n;
@@ -444,7 +451,6 @@
return -1;
}
- st->comp_size = 0;
ret = 0;
while ((n=zip_source_read(src, buf, sizeof(buf))) > 0) {
if (fwrite(buf, 1, n, ft) != (size_t)n) {
@@ -452,8 +458,6 @@
ret = -1;
break;
}
-
- st->comp_size += n;
}
if (n < 0) {
@@ -462,11 +466,7 @@
ret = -1;
}
- if (zip_source_close(src) < 0) {
- if (ret == 0)
- _zip_error_set_from_source(&za->error, src);
- ret = -1;
- }
+ zip_source_close(src);
return ret;
}
diff --git a/lib/zip_source_close.c b/lib/zip_source_close.c
index a889b97..882a199 100644
--- a/lib/zip_source_close.c
+++ b/lib/zip_source_close.c
@@ -37,28 +37,18 @@
-ZIP_EXTERN int
+ZIP_EXTERN void
zip_source_close(struct zip_source *src)
{
- int ret;
-
- /* XXX: Should we even allow ZIP_SOURCE_CLOSE to return an error? */
+ if (!src->is_open)
+ return;
if (src->src == NULL)
- return src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_CLOSE);
-
- ret = src->cb.l(src->src, src->ud, NULL, 0, ZIP_SOURCE_CLOSE);
- if (ret < 0) {
- if (ret == ZIP_SOURCE_ERR_LOWER)
- src->error_source = ZIP_LES_LOWER;
- else
- src->error_source = ZIP_LES_UPPER;
- }
-
- if (zip_source_close(src->src) < 0) {
- src->error_source = ZIP_LES_LOWER;
- return -1;
+ (void)src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_CLOSE);
+ else {
+ (void)src->cb.l(src->src, src->ud, NULL, 0, ZIP_SOURCE_CLOSE);
+ zip_source_close(src->src);
}
- return ret < 0 ? -1 : 0;
+ src->is_open = 0;
}
diff --git a/lib/zip_source_deflate.c b/lib/zip_source_deflate.c
index e349470..0da1940 100644
--- a/lib/zip_source_deflate.c
+++ b/lib/zip_source_deflate.c
@@ -105,7 +105,6 @@
{
int end, ret;
zip_int64_t n;
- zip_uint64_t out_before;
if (ctx->e[0] != 0)
return -1;
@@ -115,7 +114,6 @@
ctx->zstr.next_out = (Bytef *)data;
ctx->zstr.avail_out = len;
- out_before = ctx->zstr.total_out;
end = 0;
while (!end) {
@@ -126,7 +124,8 @@
case Z_STREAM_END:
/* all ok */
- if (ctx->zstr.total_out - out_before >= len)
+ if (ctx->zstr.avail_out == 0
+ || (ctx->eof && ctx->zstr.avail_in == 0))
end = 1;
break;
@@ -167,8 +166,8 @@
}
}
- if (ctx->zstr.total_out > out_before)
- return ctx->zstr.total_out - out_before;
+ if (ctx->zstr.avail_out < len)
+ return len - ctx->zstr.avail_out;
return (ctx->e[0] == 0) ? 0 : -1;
}
@@ -321,6 +320,9 @@
switch (cmd) {
case ZIP_SOURCE_OPEN:
+ if ((n=zip_source_read(src, ctx->buffer, sizeof(ctx->buffer))) < 0)
+ return ZIP_SOURCE_ERR_LOWER;
+
ctx->zstr.zalloc = Z_NULL;
ctx->zstr.zfree = Z_NULL;
ctx->zstr.opaque = NULL;
diff --git a/lib/zip_source_free.c b/lib/zip_source_free.c
index 1e6ffe1..b1e7840 100644
--- a/lib/zip_source_free.c
+++ b/lib/zip_source_free.c
@@ -45,12 +45,15 @@
if (src == NULL)
return;
- if (src->src) {
+ if (src->is_open)
+ zip_source_close(src);
+
+ if (src->src == NULL)
+ (void)src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_FREE);
+ else {
(void)src->cb.l(src->src, src->ud, NULL, 0, ZIP_SOURCE_FREE);
zip_source_free(src->src);
}
- else
- (void)src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_FREE);
free(src);
}
diff --git a/lib/zip_source_function.c b/lib/zip_source_function.c
index 0e75686..cb92e33 100644
--- a/lib/zip_source_function.c
+++ b/lib/zip_source_function.c
@@ -47,14 +47,32 @@
if (za == NULL)
return NULL;
- if ((zs=(struct zip_source *)malloc(sizeof(*zs))) == NULL) {
- _zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+ if ((zs=_zip_source_new(za)) == NULL)
return NULL;
- }
- zs->src = NULL;
zs->cb.f = zcb;
zs->ud = ud;
return zs;
}
+
+
+
+struct zip_source *
+_zip_source_new(struct zip *za)
+{
+ struct zip_source *src;
+
+ if ((src=(struct zip_source *)malloc(sizeof(*src))) == NULL) {
+ _zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+ return NULL;
+ }
+
+ src->src = NULL;
+ src->cb.f = NULL;
+ src->ud = NULL;
+ src->error_source = ZIP_LES_NONE;
+ src->is_open = 0;
+
+ return src;
+}
diff --git a/lib/zip_source_layered.c b/lib/zip_source_layered.c
index 433c77a..9bdf3c5 100644
--- a/lib/zip_source_layered.c
+++ b/lib/zip_source_layered.c
@@ -48,15 +48,12 @@
if (za == NULL)
return NULL;
- if ((zs=(struct zip_source *)malloc(sizeof(*zs))) == NULL) {
- _zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+ if ((zs=_zip_source_new(za)) == NULL)
return NULL;
- }
zs->src = src;
zs->cb.l = cb;
zs->ud = ud;
- zs->error_source = ZIP_LES_NONE;
return zs;
}
diff --git a/lib/zip_source_open.c b/lib/zip_source_open.c
index 9923bda..a279e20 100644
--- a/lib/zip_source_open.c
+++ b/lib/zip_source_open.c
@@ -42,25 +42,35 @@
{
zip_int64_t ret;
- if (src->src == NULL)
- return src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_OPEN);
-
- if (zip_source_open(src->src) < 0) {
- src->error_source = ZIP_LES_LOWER;
+ if (src->is_open) {
+ src->error_source = ZIP_LES_INVAL;
return -1;
}
- ret = src->cb.l(src->src, src->ud, NULL, 0, ZIP_SOURCE_OPEN);
-
- if (ret < 0) {
- (void)zip_source_close(src->src);
-
- if (ret == ZIP_SOURCE_ERR_LOWER)
+ if (src->src == NULL) {
+ if (src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_OPEN) < 0)
+ return -1;
+ }
+ else {
+ if (zip_source_open(src->src) < 0) {
src->error_source = ZIP_LES_LOWER;
- else
- src->error_source = ZIP_LES_UPPER;
- return -1;
+ return -1;
+ }
+
+ ret = src->cb.l(src->src, src->ud, NULL, 0, ZIP_SOURCE_OPEN);
+
+ if (ret < 0) {
+ (void)zip_source_close(src->src);
+
+ if (ret == ZIP_SOURCE_ERR_LOWER)
+ src->error_source = ZIP_LES_LOWER;
+ else
+ src->error_source = ZIP_LES_UPPER;
+ return -1;
+ }
}
+
+ src->is_open = 1;
return 0;
}
diff --git a/lib/zip_source_pop.c b/lib/zip_source_pop.c
index 7352251..88d37da 100644
--- a/lib/zip_source_pop.c
+++ b/lib/zip_source_pop.c
@@ -49,9 +49,15 @@
lower = src->src;
- (void)src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_FREE);
-
- free(src);
+ if (lower == NULL)
+ zip_source_free(src);
+ else {
+ if (src->is_open)
+ (void)src->cb.l(src, src->ud, NULL, 0, ZIP_SOURCE_CLOSE);
+ (void)src->cb.l(src, src->ud, NULL, 0, ZIP_SOURCE_FREE);
+
+ free(src);
+ }
return lower;
}
diff --git a/lib/zip_source_read.c b/lib/zip_source_read.c
index ef7147d..432243b 100644
--- a/lib/zip_source_read.c
+++ b/lib/zip_source_read.c
@@ -42,7 +42,7 @@
{
zip_int64_t ret;
- if (len > ZIP_INT64_MAX || (len > 0 && data == NULL)) {
+ if (!src->is_open || len > ZIP_INT64_MAX || (len > 0 && data == NULL)) {
src->error_source = ZIP_LES_INVAL;
return -1;
}
diff --git a/lib/zipint.h b/lib/zipint.h
index 9e9b0cc..f52a996 100644
--- a/lib/zipint.h
+++ b/lib/zipint.h
@@ -184,6 +184,7 @@
} cb;
void *ud;
enum zip_les error_source;
+ int is_open;
};
/* entry in zip archive directory */
@@ -247,6 +248,7 @@
struct zip_source *_zip_source_file_or_p(struct zip *, const char *, FILE *,
zip_uint64_t, zip_int64_t, int,
const struct zip_stat *);
+struct zip_source *_zip_source_new(struct zip *);
int _zip_changed(struct zip *, int *);
void _zip_free(struct zip *);
