X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/b9bd6403d8188647182e6069b774c34d56e0b4ec..6e7d67bed9f4d76943e2f1724acff1e16b8bf7ac:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 7c90533..dbaa3fd 100644
--- 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,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);
@@ -306,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;
 }
 
@@ -317,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;
 	}