X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/d42028c588b512b26c3c4fea718cffcab602b74c..d2ff3349e261109e18d20cff1a236d3ac573ad58:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index b3e27a3..a82ab2c 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -19,6 +19,8 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <errno.h>
 #include <getopt.h>
 
 #include <glib-object.h>
@@ -29,6 +31,7 @@
 #include <uobject/loadable.h>
 #include <uobject/module.h>
 #include <uobject/package.h>
+#include <uobject/vfs.h>
 
 enum {
 	MODE_INFO,
@@ -39,10 +42,11 @@ enum {
 int verbose = 0;
 
 static const char *progname = "upkg";
-static const char *sopts = "ixvVH";
+static const char *sopts = "ixvf:VH";
 static const struct option lopts[] = {
 	{ "info",     0, NULL, 'i' },
 	{ "export",   0, NULL, 'x' },
+	{ "file",     1, NULL, 'f' },
 	{ "verbose",  0, NULL, 'v' },
 	{ "version",  0, NULL, 'V' },
 	{ "help",     0, NULL, 'H' },
@@ -62,7 +66,7 @@ There is NO WARRANTY, to the extent permitted by law."
 
 void print_usage(FILE *f)
 {
-	fprintf(f, "Usage: %s [options] package\n", progname);
+	fprintf(f, "Usage: %s [options] [object ...]\n", progname);
 }
 
 void print_help(void)
@@ -187,7 +191,9 @@ void print_upkg_exports(struct upkg *pkg)
 
 		printf("%u - %s (%s.%s)\n", i+1, name, package, class);
 		printf("  Flags: %lx\n", upkg_export_flags(pkg, i));
-		print_upkg_object_flags("    ", upkg_export_flags(pkg, i));
+		if (verbose >= 2) {
+			print_upkg_object_flags("    ", upkg_export_flags(pkg, i));
+		}
 	}
 }
 
@@ -199,16 +205,14 @@ int package_info(struct upkg *pkg)
 	print_guid(pkg->guid);
 
 	printf("Flags:   %lx\n", pkg->flags);
-	if (verbose >= 1) {
+	if (verbose >= 2) {
 		print_upkg_flags("        ", pkg->flags);
 	}
 
-	if (verbose >= 1) {
-		printf("Names:   %lu\n", pkg->name_count);
-		if (verbose >= 2) {
-			for (unsigned long i = 0; i < pkg->name_count; i++) {
-				printf("\t%s\n", upkg_get_name(pkg, i));
-			}
+	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));
 		}
 	}
 
@@ -216,7 +220,7 @@ int package_info(struct upkg *pkg)
 	if (verbose >= 1) print_upkg_exports(pkg);
 	printf("Imports: %lu\n", pkg->import_count);
 
-	return EXIT_SUCCESS;
+	return 0;
 }
 
 static int export(struct upkg *pkg, GObject *obj, unsigned idx)
@@ -260,13 +264,13 @@ int package_export(struct upkg *pkg)
 	const char *class, *package;
 	GObject *obj;
 	GType type;
-	int rc = EXIT_SUCCESS;
+	int ret = 0;
 
 	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;
+			return -1;
 		}
 
 		type = u_object_module_get_class(package, class);
@@ -275,25 +279,78 @@ int package_export(struct upkg *pkg)
 		obj = g_object_new(type, NULL);
 		if (U_OBJECT_IS_EXPORTABLE(obj)) {
 			if (export(pkg, obj, i) != 0) {
-				rc = EXIT_FAILURE;
+				ret = -1;
 			}
 		}
 		g_object_unref(obj);
 	}
 
-	return rc;
+	return ret;
+}
+
+static int process_object(int mode, const char *objname)
+{
+	GTypeModule *pkg;
+	int ret = 0;
+
+	pkg = u_pkg_open(objname);
+	if (!pkg || !g_type_module_use(pkg)) {
+		fprintf(stderr, "%s: %s: failed to open package.\n",
+		                progname, objname);
+		goto out;
+	}
+
+	if (!U_PKG(pkg)->pkg) {
+		if (u_pkg_is_native(pkg)) {
+			fprintf(stderr, "%s: %s: not a UObject package.\n",
+		                        progname, objname);
+		} else {
+			fprintf(stderr, "%s: %s: package not found.\n",
+			                progname, objname);
+		}
+
+		goto out_unuse;
+	}
+
+	switch (mode) {
+	case MODE_INFO:
+		ret = package_info(U_PKG(pkg)->pkg);
+		break;
+	case MODE_EXPORT:
+		ret = package_export(U_PKG(pkg)->pkg);
+		break;
+	default:
+		abort();
+	}
+
+out_unuse:
+	g_type_module_unuse(pkg);
+out:
+	return ret;
 }
 
 int main(int argc, char **argv)
 {
-	UPkg *upkg;
+	const char *pkgname = NULL;
 	unsigned mode = MODE_INFO;
-	int opt, rc = EXIT_FAILURE;
+	int opt, rc;
 
 	if (argc > 0) progname = argv[0];
 
+	if (u_pkg_vfs_init() != 0)
+		return EXIT_FAILURE;
+	if (u_object_module_init() != 0)
+		return EXIT_FAILURE;
+
 	while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
 		switch (opt) {
+		case 'f':
+			pkgname = u_pkg_vfs_add_local(NULL, optarg);
+			if (!pkgname) {
+				fprintf(stderr, "failed to add package `%s'.\n", optarg);
+				return EXIT_FAILURE;
+			}
+			break;
 		case 'i':
 			mode = MODE_INFO;
 			break;
@@ -315,30 +372,23 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (argv[optind] == NULL) {
+	if (!pkgname && !argv[optind]) {
 		print_usage(stderr);
 		return EXIT_FAILURE;
 	}
 
-	if (u_object_module_init() != 0)
-		return EXIT_FAILURE;
-
-	upkg = U_PKG(u_pkg_new_by_file(argv[optind]));
-	if (!upkg) {
-		fprintf(stderr, "failed to open package!\n");
-		return EXIT_FAILURE;
-	}
-
-	switch (mode) {
-	case MODE_INFO:
-		rc = package_info(upkg->pkg);
-		break;
-	case MODE_EXPORT:
-		rc = package_export(upkg->pkg);
-		break;
+	rc = EXIT_SUCCESS;
+	if (argv[optind]) {
+		for (int i = optind; i < argc; i++) {
+			if (process_object(mode, argv[i]) != 0)
+				rc = EXIT_FAILURE;
+		}
+	} else {
+		if (process_object(mode, pkgname) != 0)
+			rc = EXIT_FAILURE;
 	}
 
-	g_object_unref(upkg);
 	u_object_module_exit();
+	u_pkg_vfs_exit();
 	return rc;
 }