Merge branch 'v0.15.x'

Conflicts:
	src/archive/bz2_plugin.c
	src/archive_api.h
	src/input/file_input_plugin.c
	test/run_input.c
This commit is contained in:
Max Kellermann
2009-12-15 20:26:38 +01:00
7 changed files with 89 additions and 49 deletions

View File

@@ -67,6 +67,7 @@ input_archive_open(struct input_stream *is, const char *pathname)
if (!opened) {
g_warning("open inarchive file %s failed\n\n",filename);
arplug->close(file);
} else {
is->ready = true;
}