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

diff --git a/src/upkg.c b/src/upkg.c
index c13a867..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,26 +309,49 @@ 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;
 }
 
-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_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+		fprintf(stderr, "%s: failed to load export data.\n", progname);
 		return -1;
 	}
 
-	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+	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;
 	}
 
-	u_object_export_name(obj, name, sizeof name);
+	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);
@@ -346,26 +372,52 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 	return 0;
 }
 
-int package_export(struct upkg *pkg)
+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;
 	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;
 		}
 
 		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;
 			}
 		}
@@ -436,7 +488,10 @@ 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);
+		if (current < 0)
+			ret = package_export(pkg);
+		else
+			ret = object_export(pkg, current);
 		break;
 	default:
 		abort();