X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/bc5c414abd86bb2eb06a5f48ad93d953b99cc020..5fe7c42921be9f911805b4006f59a0910c9404d0:/src/libupkg.c?ds=inline

diff --git a/src/libupkg.c b/src/libupkg.c
index 6012f09..45fda93 100644
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -171,7 +171,7 @@ static int pkg_init_names(struct upkg *pkg)
 		/* Read some data into buffer. */
 		if (!feof(pkg->priv->f)) {
 			rc = fread(buf+nbuf, 1, sizeof buf-nbuf, pkg->priv->f);
-			if (rc == 0)
+			if (rc == 0 && nbuf == 0)
 				goto err;
 			nbuf += rc;
 		}
@@ -236,7 +236,7 @@ static int pkg_init_exports(struct upkg *pkg)
 		/* Read some data into buffer. */
 		if (!feof(pkg->priv->f)) {
 			rc = fread(buf+nbuf, 1, sizeof buf-nbuf, pkg->priv->f);
-			if (rc == 0)
+			if (rc == 0 && nbuf == 0)
 				goto err;
 			nbuf += rc;
 		}
@@ -251,7 +251,7 @@ static int pkg_init_exports(struct upkg *pkg)
 		len += rc;
 
 		if (nbuf-len < 4) goto err;
-		export->package = unpack_32_le(buf+len);
+		export->package = unpack_s32_le(buf+len);
 		len += 4;
 
 		rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
@@ -306,7 +306,7 @@ static int pkg_init_imports(struct upkg *pkg)
 		/* Read some data into buffer. */
 		if (!feof(pkg->priv->f)) {
 			rc = fread(buf+nbuf, 1, sizeof buf-nbuf, pkg->priv->f);
-			if (rc == 0)
+			if (rc == 0 && nbuf == 0)
 				goto err;
 			nbuf += rc;
 		}
@@ -323,7 +323,7 @@ static int pkg_init_imports(struct upkg *pkg)
 		len += rc;
 
 		if (nbuf-len < 4) goto err;
-		import->package = unpack_32_le(buf+len);
+		import->package = unpack_s32_le(buf+len);
 		len += 4;
 
 		rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
@@ -436,6 +436,13 @@ long upkg_export_find(struct upkg *pkg, const char *name)
 	return -1;
 }
 
+unsigned long upkg_export_flags(struct upkg *pkg, unsigned long idx)
+{
+	if (idx < pkg->export_count)
+		return pkg->priv->exports[idx].flags;
+	return 0;
+}
+
 const char *upkg_export_name(struct upkg *pkg, unsigned long idx)
 {
 	if (idx < pkg->export_count)