Fix another mistake in uobject's property parsing.

[upkg.git] / src / libupkg.c

diff --git a/src/libupkg.c b/src/libupkg.c
index f7c55ba2fbf26428c110369e021d7c4d0bb6484e..4bb13a3fa7b0f85c55197ead75af52ebc9f77795 100644 (file)
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -124,6 +124,34 @@ static struct upkg *init_upkg(unsigned char hdr[static UPKG_HDR_SIZE])
        return &alloc->pkg;
 }
 
+static int pkg_init_guid(struct upkg *pkg)
+{
+       size_t rc;
+
+       if (pkg->version < 68) {
+               unsigned long heritage_count, heritage_offset;
+               unsigned char buf[8];
+
+               rc = fread(buf, 1, sizeof buf, pkg->priv->f);
+               if (rc < 8)
+                       return -1;
+
+               heritage_count  = unpack_32_le(buf+0);
+               heritage_offset = unpack_32_le(buf+4);
+
+               if (heritage_count == 0)
+                       return -1;
+               if (fseek(pkg->priv->f, heritage_offset, SEEK_SET) != 0)
+                       return -1;
+       }
+
+       rc = fread(pkg->guid, 1, 16, pkg->priv->f);
+       if (rc < 16)
+               return -1;
+
+       return 0;
+}
+
 static int pkg_init_names(struct upkg *pkg)
 {
        size_t rc, len, nbuf = 0;
@@ -335,6 +363,10 @@ struct upkg *upkg_fopen(const char *path)
        }
        pkg->priv->f = f;
 
+       if (pkg_init_guid(pkg) != 0) {
+               goto err2;
+       }
+
        if (pkg_init_names(pkg) != 0) {
                goto err2;
        }
@@ -442,8 +474,14 @@ int upkg_export_seek(struct upkg_file *f, long offset, int whence)
                break;
        }
 
-       if (rc == 0)
+       if (rc == 0) {
                f->pkg->priv->last_file = f;
+               f->offset = offset;
+               f->eof = 0;
+       } else if (f->pkg->priv->last_file == f) {
+               f->pkg->priv->last_file = NULL;
+       }
+
        return rc;
 }
 
@@ -463,5 +501,8 @@ size_t upkg_export_read(struct upkg_file *f, void *buf, size_t n)
 
        rc = fread(buf, 1, want, f->pkg->priv->f);
        f->offset += rc;
+
+       if (want < n || rc < want && feof(f->pkg->priv->f))
+               f->eof = 1;
        return rc;
 }