X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4a3125b61348969b91b9642bba803fc17135c189..0a55ae84545c5e5a45e2240c06bd77a1917f7d3e:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 0388e29..d3a946b 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -28,6 +28,8 @@
 #include <uobject/exportable.h>
 #include <uobject/loadable.h>
 #include <uobject/module.h>
+#include <uobject/package.h>
+#include <uobject/vfs.h>
 
 enum {
 	MODE_INFO,
@@ -53,6 +55,7 @@ void print_version(void)
 	printf("%s\n", PACKAGE_STRING);
 	puts("\
 Copyright (C) 2009 Nick Bowler.\n\
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law."
 	);
@@ -185,7 +188,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));
+		}
 	}
 }
 
@@ -197,16 +202,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));
 		}
 	}
 
@@ -284,7 +287,8 @@ int package_export(struct upkg *pkg)
 
 int main(int argc, char **argv)
 {
-	struct upkg *pkg;
+	GTypeModule *pkg;
+	const char *pkgname;
 	unsigned mode = MODE_INFO;
 	int opt, rc = EXIT_FAILURE;
 
@@ -318,25 +322,39 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
+	if (u_pkg_vfs_init() != 0)
+		return EXIT_FAILURE;
 	if (u_object_module_init() != 0)
 		return EXIT_FAILURE;
 
-	pkg = upkg_fopen(argv[optind]);
+	pkgname = u_pkg_vfs_add_local(NULL, argv[optind]);
+	if (!pkgname) {
+		fprintf(stderr, "failed to add package `%s'.\n", argv[optind]);
+		return EXIT_FAILURE;
+	}
+
+	pkg = u_pkg_open(pkgname);
 	if (!pkg) {
 		fprintf(stderr, "failed to open package!\n");
 		return EXIT_FAILURE;
 	}
 
+	if (!g_type_module_use(pkg)) {
+		fprintf(stderr, "failed to load package: %s\n", pkg->name);
+		return EXIT_FAILURE;
+	}
+
 	switch (mode) {
 	case MODE_INFO:
-		rc = package_info(pkg);
+		rc = package_info(U_PKG(pkg)->pkg);
 		break;
 	case MODE_EXPORT:
-		rc = package_export(pkg);
+		rc = package_export(U_PKG(pkg)->pkg);
 		break;
 	}
 
-	upkg_close(pkg);
+	g_object_unref(pkg);
 	u_object_module_exit();
+	u_pkg_vfs_exit();
 	return rc;
 }