X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/eedd5d24e385f09ec109fffb558797e3c6e2889d..d3bcc750280bfce9a7f6e7ccf159400db9ad9659:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 038eb39..93b3c64 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -181,18 +181,18 @@ void print_guid(unsigned char guid[static 16])
 void print_upkg_exports(struct upkg *pkg)
 {
 	for (unsigned i = 0; i < pkg->export_count; i++) {
-		const char *name, *package, *class;
+		const struct upkg_export *export = upkg_get_export(pkg, i);
+		const char *package, *class;
 
-		name  = upkg_export_name(pkg, i);
 		class = upkg_export_class(pkg, i, &package);
 
-		if (!name || !class)
+		if (!class)
 			continue;
 
-		printf("%u - %s (%s.%s)\n", i+1, name, package, class);
-		printf("  Flags: %lx\n", upkg_export_flags(pkg, i));
+		printf("%u - %s (%s.%s)\n", i+1, export->name, package, class);
+		printf("  Flags: %lx\n", export->flags);
 		if (verbose >= 2) {
-			print_upkg_object_flags("    ", upkg_export_flags(pkg, i));
+			print_upkg_object_flags("    ", export->flags);
 		}
 	}
 }
@@ -223,8 +223,31 @@ int package_info(struct upkg *pkg)
 	return 0;
 }
 
+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));
+		printf(".%s", e->name);
+	}
+}
+
+static int export_info(GTypeModule *pkg, unsigned long idx)
+{
+	struct upkg *upkg = U_PKG(pkg)->pkg;
+	const struct upkg_export *export;
+
+	export = upkg_get_export(upkg, idx);
+
+	printf("%s", pkg->name);
+	export_print_name(upkg, export);
+	putchar('\n');
+
+	return 0;
+}
+
 static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 {
+	const struct upkg_export *export = upkg_get_export(pkg, idx);
 	char name[256];
 	FILE *of;
 
@@ -238,7 +261,7 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 
 	u_object_export_name(obj, name, sizeof name);
 
-	printf("exporting %s to %s\n", upkg_export_name(pkg, idx), name);
+	printf("exporting %s to %s\n", export->name, name);
 	of = fopen(name, "wb");
 	if (!of) {
 		perror(name);
@@ -340,7 +363,10 @@ static int process_object(int mode, const char *objname)
 
 	switch (mode) {
 	case MODE_INFO:
-		ret = package_info(U_PKG(pkg)->pkg);
+		if (current < 0)
+			ret = package_info(U_PKG(pkg)->pkg);
+		else
+			ret = export_info(pkg, current);
 		break;
 	case MODE_EXPORT:
 		ret = package_export(U_PKG(pkg)->pkg);