oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

archive/bzip2: create file only after stream has been opened

Browse Source 
Simplify error handling.
This commit is contained in:
Max Kellermann 2013-01-30 15:27:23 +01:00
parent 8e0575ca9b
commit 701fff03d2
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/archive/Bzip2ArchivePlugin.cxx
View File

@ -46,18 +46,28 @@ class Bzip2ArchiveFile : public ArchiveFile {
public: public:
RefCount ref; RefCount ref;
char *name; char *const name;
struct input_stream *istream; struct input_stream *const istream;
Bzip2ArchiveFile():ArchiveFile(bz2_archive_plugin) {} Bzip2ArchiveFile(const char *path, input_stream *_is)
:ArchiveFile(bz2_archive_plugin),
name(g_path_get_basename(path)),
istream(_is) {
// remove .bz2 suffix
size_t len = strlen(name);
if (len > 4)
name[len - 4] = 0;
}
~Bzip2ArchiveFile() {
input_stream_close(istream);
}
void Unref() { void Unref() {
if (!ref.Decrement()) if (!ref.Decrement())
return; return;
g_free(name); g_free(name);
input_stream_close(istream);
delete this; delete this;
} }
}; };
@ -123,28 +133,13 @@ Bzip2InputStream::Close()
static ArchiveFile * static ArchiveFile *
bz2_open(const char *pathname, GError **error_r) bz2_open(const char *pathname, GError **error_r)
{ {
Bzip2ArchiveFile *context = new Bzip2ArchiveFile();
int len;
//open archive
static Mutex mutex; static Mutex mutex;
static Cond cond; static Cond cond;
context->istream = input_stream_open(pathname, mutex, cond, input_stream *is = input_stream_open(pathname, mutex, cond, error_r);
error_r); if (is == nullptr)
if (context->istream == NULL) { return nullptr;
delete context;
return NULL;
}
context->name = g_path_get_basename(pathname); return new Bzip2ArchiveFile(pathname, is);
//remove suffix
len = strlen(context->name);
if (len > 4) {
context->name[len - 4] = 0; //remove .bz2 suffix
}
return context;
} }
static void static void