#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <assert.h>
#include <getopt.h>
#include <glib-object.h>
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));
}
}
static void export_print_name(struct upkg *upkg, const struct upkg_export *e)
{
if (e) {
- export_print_name(upkg, upkg_get_export(upkg, e->package-1));
+ export_print_name(upkg, e->parent);
printf(".%s", e->name);
}
}
export_print_name(U_PKG(pkg)->pkg, export);
}
-static int package_list(GTypeModule *pkg, long parent)
+static int package_list(GTypeModule *pkg, long current)
{
struct upkg *upkg = U_PKG(pkg)->pkg;
- const struct upkg_export *export;
+ const struct upkg_export *parent = NULL;
+
+ if (current >= 0) {
+ parent = upkg_get_export(upkg, current);
+ assert(parent != NULL);
+ }
for (unsigned i = 0; i < upkg->export_count; i++) {
- export = upkg_get_export(upkg, i);
+ const struct upkg_export *export = upkg_get_export(upkg, i);
- if (export->package != parent)
+ if (export->parent != parent)
continue;
export_print_fullname(pkg, export);
putchar('\n');
}
+
+ return 0;
}
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;
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_name) {
+ printf(" %s", obj->pkg_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;
}
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;
}
ret = object_info(pkg, current);
break;
case MODE_LIST:
- ret = package_list(pkg, current+1);
+ ret = package_list(pkg, current);
break;
case MODE_EXPORT:
if (current < 0)