libupkg: Make decodeindex test accept an empty string.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 6b48f72c92988277137e0702619bbb1e4d7a9041..dbaa3fd2a91c1589ee7c818831d9441cdd4fc26c 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -214,7 +214,7 @@ int package_info(struct upkg *pkg)
        printf("Names:   %lu\n", pkg->name_count);
        if (verbose >= 3) {
                for (unsigned long i = 0; i < pkg->name_count; i++) {
-                       printf("\t%s\n", upkg_get_name(pkg, i));
+                       printf("%lu - %s\n", i, upkg_get_name(pkg, i));
                }
        }
 
@@ -278,6 +278,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
        class = upkg_export_class(upkg, idx, &package);
        printf(" (%s.%s)\n", package, class);
 
+       /* Print out object properties. */
        if (verbose >= 1) {
                GParamSpec **props;
                GObject *obj;
@@ -295,7 +296,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                        GValue val = {0};
                        char *valstr;
 
-                       printf("  %s: ", props[i]->name);
+                       printf("  property %s: ", props[i]->name);
                        fflush(stdout);
 
                        g_value_init(&val, props[i]->value_type);
@@ -308,6 +309,22 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                g_object_unref(obj);
        }
 
+       /* Print raw file info. */
+       if (verbose >= 3) {
+               struct upkg_file *f = upkg_export_open(upkg, idx);
+               if (!f) {
+                       fprintf(stderr, "%s: failed to open export.\n",
+                                       progname);
+                       return -1;
+               }
+
+               printf("  file size: %lu\n", f->len);
+               printf("  file start: %#lx\n", f->base);
+               printf("  file end: %#lx\n", f->base + f->len);
+
+               upkg_export_close(f);
+       }
+
        return 0;
 }
 
@@ -319,6 +336,7 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
        int rc;
 
        if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+               fprintf(stderr, "%s: failed to load export data.\n", progname);
                return -1;
        }