X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/bb5f99272ae78a2ddc07e0a54025baab39d84c49..81729824124106a615b65f9a59280cd5be6c1c05:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 5766e8b..d54a574 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -279,19 +279,12 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
 	if (verbose >= 1) {
 		GParamSpec **props;
 		GObject *obj;
-		GType type;
 		unsigned n;
 
-		type = u_object_module_get_class(package, class);
-		if (!type) {
-			printf("  (unknown class)\n");
-			return 0;
-		}
-
-		obj = g_object_new(type, NULL);
-
-		if (u_object_deserialize(obj, upkg, idx) != 0) {
-			g_object_unref(obj);
+		obj = u_object_new_from_package(upkg, idx);
+		if (!obj) {
+			fprintf(stderr, "%s: failed to load object.\n",
+			                progname);
 			return -1;
 		}
 
@@ -316,13 +309,14 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
 	return 0;
 }
 
-static int export(struct upkg *pkg, GObject *obj, unsigned idx)
+static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 {
-	const struct upkg_export *export = upkg_get_export(pkg, idx);
+	struct upkg *upkg = U_PKG(pkg)->pkg;
 	char name[256];
 	FILE *of;
+	int rc;
 
-	if (u_object_deserialize(obj, pkg, idx) != 0) {
+	if (u_object_deserialize(obj, upkg, idx) != 0) {
 		return -1;
 	}
 
@@ -330,9 +324,18 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 		return -1;
 	}
 
-	u_object_export_name(obj, name, sizeof name);
+	rc = u_object_export_name(obj, name, sizeof name);
+	if (rc <= 0) {
+		/* XXX: We could use a default name here. */
+		fprintf(stderr, "%s: failed to determine export filename.\n",
+		                progname);
+		return -1;
+	}
+
+	printf("exporting ");
+	export_print_fullname(pkg, upkg_get_export(upkg, idx));
+	printf(" to %s\n", name);
 
-	printf("exporting %s to %s\n", export->name, name);
 	of = fopen(name, "wb");
 	if (!of) {
 		perror(name);
@@ -353,15 +356,16 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 	return 0;
 }
 
-int package_export(struct upkg *pkg)
+int package_export(GTypeModule *pkg)
 {
+	struct upkg *upkg = U_PKG(pkg)->pkg;
 	const char *class, *package;
 	GObject *obj;
 	GType type;
 	int ret = 0;
 
-	for (unsigned i = 0; i < pkg->export_count; i++) {
-		class = upkg_export_class(pkg, i, &package);
+	for (unsigned i = 0; i < upkg->export_count; i++) {
+		class = upkg_export_class(upkg, i, &package);
 		if (!class) {
 			fprintf(stderr, "error getting class information.\n");
 			return -1;
@@ -443,7 +447,7 @@ static int process_object(int mode, const char *objname)
 		ret = package_list(pkg, current+1);
 		break;
 	case MODE_EXPORT:
-		ret = package_export(U_PKG(pkg)->pkg);
+		ret = package_export(pkg);
 		break;
 	default:
 		abort();