X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/fff1391d5182da5a1082eb1a58bfe0811ea1a7bd..85f60be2c79f922fc9547abdcf7cf544041a2faa:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index d44422c..2b26aa4 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -236,29 +236,31 @@ void print_upkg_imports(struct upkg *pkg)
 	}
 }
 
-int package_info(struct upkg *pkg)
+int package_info(GTypeModule *pkg)
 {
-	printf("Version: %u\n",  pkg->version);
-	printf("License: %u\n",  pkg->license);
+	struct upkg *upkg = U_PKG(pkg)->pkg;
+
+	printf("Version: %u\n", upkg->version);
+	printf("License: %u\n", upkg->license);
 	printf("GUID: ");
-	print_guid(pkg->guid);
+	print_guid(upkg->guid);
 
-	printf("Flags:   %lx\n", pkg->flags);
+	printf("Flags:   %lx\n", upkg->flags);
 	if (verbose >= 2) {
-		print_upkg_flags("        ", pkg->flags);
+		print_upkg_flags("        ", upkg->flags);
 	}
 
-	printf("Names:   %lu\n", pkg->name_count);
+	printf("Names:   %lu\n", upkg->name_count);
 	if (verbose >= 3) {
-		for (unsigned long i = 0; i < pkg->name_count; i++) {
-			printf("%lu - %s\n", i, upkg_get_name(pkg, i));
+		for (unsigned long i = 0; i < upkg->name_count; i++) {
+			printf("%lu - %s\n", i, upkg_get_name(upkg, i));
 		}
 	}
 
-	printf("Exports: %lu\n", pkg->export_count);
-	if (verbose >= 1) print_upkg_exports(pkg);
-	printf("Imports: %lu\n", pkg->import_count);
-	if (verbose >= 1) print_upkg_imports(pkg);
+	printf("Exports: %lu\n", upkg->export_count);
+	if (verbose >= 1) print_upkg_exports(upkg);
+	printf("Imports: %lu\n", upkg->import_count);
+	if (verbose >= 1) print_upkg_imports(upkg);
 
 	return 0;
 }
@@ -294,78 +296,92 @@ static int package_list(GTypeModule *pkg, long current)
 	return 0;
 }
 
-static int object_info(GTypeModule *pkg, unsigned long idx)
+static int object_dump_properties(GTypeModule *pkg, unsigned long idx)
 {
-	struct upkg *upkg = U_PKG(pkg)->pkg;
-	const struct upkg_export *export;
-	const char *class, *package;
-
-	export = upkg_get_export(upkg, idx);
-	export_print_fullname(pkg, export);
+	GParamSpec **props;
+	GObject *obj;
+	unsigned n;
 
-	class = upkg_export_class(upkg, idx, &package);
-	printf(" (%s.%s)\n", package, class);
-
-	/* Print out object properties. */
-	if (verbose >= 1) {
-		GParamSpec **props;
-		GObject *obj;
-		unsigned n;
-
-		obj = u_object_new_from_package(pkg, idx);
-		if (!obj) {
-			fprintf(stderr, "%s: failed to load object.\n",
-			                progname);
-			return -1;
-		}
+	obj = u_object_new_from_package(pkg, idx);
+	if (!obj) {
+		fprintf(stderr, "%s: failed to load object.\n", progname);
+		return -1;
+	}
 
-		props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
-		for (unsigned i = 0; i < n; i++) {
-			GValue val = {0};
-			char *valstr;
+	props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
+	for (unsigned i = 0; i < n; i++) {
+		GValue val = {0};
+		char *valstr;
 
-			printf("  property %s:", props[i]->name);
-			fflush(stdout);
+		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);
+		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);
+		if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
+			UObject *obj = g_value_get_object(&val);
 
-				if (obj && obj->pkg_name) {
-					printf(" %s", obj->pkg_name);
-				}
+			if (obj && obj->pkg_name) {
+				printf(" %s", obj->pkg_name);
 			}
-
-			valstr = g_strdup_value_contents(&val);
-			printf(" %s\n", valstr);
-			g_free(valstr);
 		}
-		free(props);
 
-		g_object_unref(obj);
+		valstr = g_strdup_value_contents(&val);
+		printf(" %s\n", valstr);
+		g_free(valstr);
 	}
 
-	/* 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;
-		}
+	g_free(props);
+	g_object_unref(obj);
+
+	return 0;
+}
 
-		printf("  file size: %lu\n", f->len);
-		printf("  file start: %#lx\n", f->base);
-		printf("  file end: %#lx\n", f->base + f->len);
+static int object_dump_offsets(GTypeModule *pkg, unsigned long idx)
+{
+	struct upkg_file *f;
 
-		upkg_export_close(f);
+	f = upkg_export_open(U_PKG(pkg)->pkg, 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;
 }
 
+static int object_info(GTypeModule *pkg, unsigned long idx)
+{
+	struct upkg *upkg = U_PKG(pkg)->pkg;
+	const struct upkg_export *export;
+	const char *class, *package;
+	int ret = 0;
+
+	export = upkg_get_export(upkg, idx);
+	export_print_fullname(pkg, export);
+
+	class = upkg_export_class(upkg, idx, &package);
+	if (class)
+		printf(" (%s.%s)\n", package, class);
+	else
+		printf(" (failed to get class)\n");
+
+	if (verbose >= 1 && object_dump_properties(pkg, idx) != 0)
+		ret = -1;
+
+	if (verbose >= 3 && object_dump_offsets(pkg, idx))
+		ret = -1;
+
+	return ret;
+}
+
 static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 {
 	struct upkg *upkg = U_PKG(pkg)->pkg;
@@ -502,7 +518,7 @@ static int process_object(int mode, const char *objname)
 	switch (mode) {
 	case MODE_INFO:
 		if (current < 0)
-			ret = package_info(U_PKG(pkg)->pkg);
+			ret = package_info(pkg);
 		else
 			ret = object_info(pkg, current);
 		break;