X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/94fc44d9acf969477faac61bd60a6812404727f9..20aff832debc500f41798d5bc9577cae68ccba27:/src/upkg.c?ds=sidebyside

diff --git a/src/upkg.c b/src/upkg.c
index 82a673d..ef44bf6 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -28,6 +28,7 @@
 #include "module.h"
 #include "uobject.h"
 #include "exportable.h"
+#include "loadable.h"
 
 enum {
 	MODE_INFO,
@@ -153,34 +154,38 @@ int package_info(struct upkg *pkg)
 
 static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 {
-	struct upkg_file *f = upkg_export_open(pkg, idx);
 	char name[256];
 	FILE *of;
-	int rc = -1;
 
-	if (u_object_deserialize(obj, f) != 0) {
-		goto out;
+	if (u_object_deserialize(obj, pkg, idx) != 0) {
+		return -1;
 	}
+
+	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+		return -1;
+	}
+
 	u_object_export_name(obj, name, sizeof name);
 
 	printf("exporting %s to %s\n", upkg_export_name(pkg, idx), name);
 	of = fopen(name, "wb");
 	if (!of) {
 		perror(name);
-		goto out;
+		return -1;
 	}
 
-	rc = u_object_export(obj, of);
+	u_object_export(obj, of);
 
 	if (fclose(of) != 0) {
 		perror(name);
-		rc = -1;
-		goto out;
+		return -1;
 	}
 
-out:
-	upkg_export_close(f);
-	return rc;
+	if (U_OBJECT_IS_LOADABLE(obj)) {
+		u_object_unload(obj);
+	}
+
+	return 0;
 }
 
 int package_export(struct upkg *pkg)
@@ -192,6 +197,10 @@ int package_export(struct upkg *pkg)
 
 	for (unsigned i = 0; i < pkg->export_count; i++) {
 		class = upkg_export_class(pkg, i, &package);
+		if (!class) {
+			fprintf(stderr, "error getting class information.\n");
+			return EXIT_FAILURE;
+		}
 
 		type = module_get_class(package, class);
 		if (!type) continue;