X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/81729824124106a615b65f9a59280cd5be6c1c05..45c92fd47dad10216eb2589b81f35a13cd1837f5:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index d54a574..7448aba 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -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;
 }
 
@@ -316,10 +335,6 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 	FILE *of;
 	int rc;
 
-	if (u_object_deserialize(obj, upkg, idx) != 0) {
-		return -1;
-	}
-
 	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
 		return -1;
 	}
@@ -356,6 +371,29 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 	return 0;
 }
 
+static int object_export(GTypeModule *pkg, unsigned long idx)
+{
+	struct upkg *upkg = U_PKG(pkg)->pkg;
+	GObject *obj;
+	int ret = -1;
+
+	obj = u_object_new_from_package(upkg, idx);
+	if (!obj) {
+		fprintf(stderr, "%s: failed to load object.\n", progname);
+		return -1;
+	}
+
+	if (!U_OBJECT_IS_EXPORTABLE(obj)) {
+		fprintf(stderr, "%s: object is not exportable.\n", progname);
+		goto out;
+	}
+
+	ret = export(pkg, obj, idx);
+out:
+	g_object_unref(obj);
+	return ret;
+}
+
 int package_export(GTypeModule *pkg)
 {
 	struct upkg *upkg = U_PKG(pkg)->pkg;
@@ -372,11 +410,13 @@ int package_export(GTypeModule *pkg)
 		}
 
 		type = u_object_module_get_class(package, class);
-		if (!type) continue;
+		if (!type)
+			continue;
 
 		obj = g_object_new(type, NULL);
 		if (U_OBJECT_IS_EXPORTABLE(obj)) {
-			if (export(pkg, obj, i) != 0) {
+			if (u_object_deserialize(obj, upkg, i) != 0
+			    || export(pkg, obj, i) != 0) {
 				ret = -1;
 			}
 		}
@@ -447,7 +487,10 @@ static int process_object(int mode, const char *objname)
 		ret = package_list(pkg, current+1);
 		break;
 	case MODE_EXPORT:
-		ret = package_export(pkg);
+		if (current < 0)
+			ret = package_export(pkg);
+		else
+			ret = object_export(pkg, current);
 		break;
 	default:
 		abort();