libupkg: Add a destructor that is called on package close.

This fixes mistake where fclose was called unconditionally in
upkg_close.

diff --git a/src/libupkg.c b/src/libupkg.c
index ae488209cf1142d350b69990899aed6e87359585..004cb4669fa7c64ab02a836406badaba590f86a0 100644 (file)
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -45,6 +45,7 @@ struct upkg_import {
 
 struct upkg_private {
        const struct upkg_file_ops *fops;
+       int (*dtor)(void *handle);
        void *f;
 
        struct upkg_file *last_file;
@@ -78,6 +79,11 @@ static int file_eof(void *handle)
        return feof(handle);
 }
 
+static int file_close(void *handle)
+{
+       return fclose(handle);
+}
+
 const struct upkg_file_ops upkg_default_fops = {
        .read = file_read,
        .seek = file_seek,
@@ -380,7 +386,8 @@ err:
        return -1;
 }
 
-struct upkg *upkg_open(void *f, const struct upkg_file_ops *fops)
+struct upkg *upkg_open(void *f, const struct upkg_file_ops *fops,
+                       int (*destructor)(void *handle))
 {
        unsigned char hdr_buf[UPKG_HDR_SIZE];
        struct upkg *pkg;
@@ -398,6 +405,7 @@ struct upkg *upkg_open(void *f, const struct upkg_file_ops *fops)
                return NULL;
        }
        pkg->priv->fops = fops;
+       pkg->priv->dtor = destructor;
        pkg->priv->f    = f;
 
        if (pkg_init_guid(pkg) != 0) {
@@ -438,7 +446,7 @@ struct upkg *upkg_fopen(const char *path)
                return NULL;
        }
 
-       pkg = upkg_open(f, &upkg_default_fops);
+       pkg = upkg_open(f, &upkg_default_fops, file_close);
        if (!pkg) {
                fclose(f);
        }
@@ -450,12 +458,12 @@ int upkg_close(struct upkg *pkg)
 {
        int rc = 0;
 
-       if (pkg->priv->f) {
-               rc = fclose(pkg->priv->f);
+       if (pkg->priv->dtor) {
+               rc = pkg->priv->dtor(pkg->priv->f);
+       }
 
-               for (unsigned i = 0; i < pkg->name_count; i++) {
-                       free(pkg->priv->names[i].name);
-               }
+       for (unsigned i = 0; i < pkg->name_count; i++) {
+               free(pkg->priv->names[i].name);
        }
 
        free(pkg->priv->imports);

diff --git a/src/upkg.h b/src/upkg.h
index 9fc80034af962ba894533d421f2166636ec2e50e..c5da628b1660df074ad6cef64dd6d2234cef799f 100644 (file)
--- a/src/upkg.h
+++ b/src/upkg.h
@@ -91,7 +91,8 @@ struct upkg_file {
 /* Default I/O operations for ordinary files. */
 extern const struct upkg_file_ops upkg_default_fops;
 
-struct upkg *upkg_open(void *handle, const struct upkg_file_ops *fops);
+struct upkg *upkg_open(void *handle, const struct upkg_file_ops *fops,
+                       int (*destructor)(void *handle));
 struct upkg *upkg_fopen(const char *path);
 int upkg_close(struct upkg *pkg);