aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-31 10:25:01 +0100
committerMax Kellermann <max@duempel.org>2009-12-31 16:00:12 +0100
commit9862521aec461bc59236510b9a86ce9571039e91 (patch)
tree348025cdc9f01809e940681b60da3c200022bc11
parent55fbb67cfbc42a479311f5d50ab729b11ac1af43 (diff)
downloadmpd-9862521aec461bc59236510b9a86ce9571039e91.tar.gz
mpd-9862521aec461bc59236510b9a86ce9571039e91.tar.xz
mpd-9862521aec461bc59236510b9a86ce9571039e91.zip
archive/zzip: added struct zzip_input_stream
Don't use the zzip_archive object for the input_stream.
-rw-r--r--src/archive/zzip_archive_plugin.c52
1 files changed, 33 insertions, 19 deletions
diff --git a/src/archive/zzip_archive_plugin.c b/src/archive/zzip_archive_plugin.c
index 6c477c0af..087071a47 100644
--- a/src/archive/zzip_archive_plugin.c
+++ b/src/archive/zzip_archive_plugin.c
@@ -35,7 +35,6 @@ struct zzip_archive {
struct archive_file base;
ZZIP_DIR *dir;
- ZZIP_FILE *file;
GSList *list;
GSList *iter;
};
@@ -117,27 +116,39 @@ zzip_archive_close(struct archive_file *file)
/* single archive handling */
+struct zzip_input_stream {
+ struct zzip_archive *archive;
+
+ ZZIP_FILE *file;
+};
+
static bool
zzip_archive_open_stream(struct archive_file *file, struct input_stream *is,
const char *pathname, GError **error_r)
{
struct zzip_archive *context = (struct zzip_archive *) file;
+ struct zzip_input_stream *zis;
ZZIP_STAT z_stat;
+ zis = g_new(struct zzip_input_stream, 1);
+
+ zis->archive = context;
+ zis->file = zzip_file_open(context->dir, pathname, 0);
+ if (zis->file == NULL) {
+ g_free(zis);
+ g_set_error(error_r, zzip_quark(), 0,
+ "not found in the ZIP file: %s", pathname);
+ return false;
+ }
+
//setup file ops
is->plugin = &zzip_input_plugin;
//insert back reference
- is->data = context;
+ is->data = zis;
//we are seekable (but its not recommendent to do so)
is->seekable = true;
- context->file = zzip_file_open(context->dir, pathname, 0);
- if (!context->file) {
- g_set_error(error_r, zzip_quark(), 0,
- "not found in the ZIP file: %s", pathname);
- return false;
- }
- zzip_file_stat(context->file, &z_stat);
+ zzip_file_stat(zis->file, &z_stat);
is->size = z_stat.st_size;
return true;
}
@@ -145,26 +156,28 @@ zzip_archive_open_stream(struct archive_file *file, struct input_stream *is,
static void
zzip_input_close(struct input_stream *is)
{
- struct zzip_archive *context = (struct zzip_archive *) is->data;
- zzip_file_close (context->file);
+ struct zzip_input_stream *zis = (struct zzip_input_stream *)is->data;
- zzip_archive_close((struct archive_file *)context);
+ zzip_file_close(zis->file);
+ zzip_archive_close(&zis->archive->base);
+ g_free(zis);
}
static size_t
zzip_input_read(struct input_stream *is, void *ptr, size_t size,
GError **error_r)
{
- struct zzip_archive *context = (struct zzip_archive *) is->data;
+ struct zzip_input_stream *zis = (struct zzip_input_stream *)is->data;
int ret;
- ret = zzip_file_read(context->file, ptr, size);
+
+ ret = zzip_file_read(zis->file, ptr, size);
if (ret < 0) {
g_set_error(error_r, zzip_quark(), ret,
"zzip_file_read() has failed");
return 0;
}
- is->offset = zzip_tell(context->file);
+ is->offset = zzip_tell(zis->file);
return ret;
}
@@ -172,16 +185,17 @@ zzip_input_read(struct input_stream *is, void *ptr, size_t size,
static bool
zzip_input_eof(struct input_stream *is)
{
- struct zzip_archive *context = (struct zzip_archive *) is->data;
- return (goffset)zzip_tell(context->file) == is->size;
+ struct zzip_input_stream *zis = (struct zzip_input_stream *)is->data;
+
+ return (goffset)zzip_tell(zis->file) == is->size;
}
static bool
zzip_input_seek(struct input_stream *is,
goffset offset, int whence, GError **error_r)
{
- struct zzip_archive *context = (struct zzip_archive *) is->data;
- zzip_off_t ofs = zzip_seek(context->file, offset, whence);
+ struct zzip_input_stream *zis = (struct zzip_input_stream *)is->data;
+ zzip_off_t ofs = zzip_seek(zis->file, offset, whence);
if (ofs != -1) {
g_set_error(error_r, zzip_quark(), ofs,
"zzip_seek() has failed");