upkg: Display object names in property listings.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 7c905334c48f2b5c14975d1be070dcdb1e5d5e3f..8fe9a2afd2789c98c5e32d1d84903e87d5fd0a64 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));
                }
        }
 
@@ -262,6 +262,8 @@ static int package_list(GTypeModule *pkg, long parent)
 
                putchar('\n');
        }
+
+       return 0;
 }
 
 static int object_info(GTypeModule *pkg, unsigned long idx)
@@ -276,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;
@@ -293,19 +296,46 @@ 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);
                        g_object_get_property(obj, props[i]->name, &val);
+
+                       if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
+                               UObject *obj = g_value_get_object(&val);
+
+                               /* TODO: Display full object names here. */
+                               if (obj->pkg_file) {
+                                       printf(" %s", obj->pkg_file->name);
+                               }
+                       }
+
                        valstr = g_strdup_value_contents(&val);
-                       printf("%s\n", valstr);
+                       printf(" %s\n", valstr);
+                       g_free(valstr);
                }
                free(props);
 
                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;
 }
 
@@ -317,6 +347,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;
        }