upkg: Print export flags.

[upkg.git] / src / libupkg.c

diff --git a/src/libupkg.c b/src/libupkg.c
index d5203b4ba6dba94ef955fd75fdff61bea20a667d..45fda93c8cd7399d9ec5e67555242881bf22b799 100644 (file)
--- 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)
@@ -444,7 +451,7 @@ const char *upkg_export_name(struct upkg *pkg, unsigned long idx)
 }
 
 const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
-                              const char **package, const char **group)
+                              const char **package)
 {
        struct upkg_export *export;
        struct upkg_import *iclass, *ipackage;
@@ -461,27 +468,6 @@ const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
                return NULL;
        }
 
-       /* ASSUMPTION: group references are always exports */
-       if (export->package < 0) {
-               fprintf(stderr, "Assumption Violated: group not export\n");
-               return NULL;
-       }
-
-       /* Get the group name. */
-       if (export->package > 0) {
-               pkg_idx = export->package - 1;
-
-               if (pkg_idx >= pkg->export_count) {
-                       return NULL;
-               }
-
-               /* Lots more to handle.  Function arguments are stupid. */
-
-               if (group) *group = pkg->priv->exports[pkg_idx].name;
-       } else {
-               if (group) *group = NULL;
-       }
-
        /* Get the class. */
        if (export->class == 0) {
                if (package) *package = "Core";