upkg: Improve error reporting during package load.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 94ace921cb22dde2558e26f7a4c9daa33b51705d..19f1449a3e1aa53ab550438c43886d88909ad433 100644 (file)
--- 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,
@@ -38,10 +40,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' },
@@ -61,7 +64,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]\n", progname);
 }
 
 void print_help(void)
@@ -186,7 +189,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));
+               }
        }
 }
 
@@ -198,16 +203,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));
                }
        }
 
@@ -285,14 +288,27 @@ int package_export(struct upkg *pkg)
 
 int main(int argc, char **argv)
 {
-       struct upkg *pkg;
+       GTypeModule *pkg;
+       const char *pkgname = NULL;
        unsigned mode = MODE_INFO;
        int opt, rc = EXIT_FAILURE;
 
        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;
@@ -314,30 +330,41 @@ int main(int argc, char **argv)
                }
        }
 
-       if (argv[optind] == NULL) {
+       if (!pkgname) {
                print_usage(stderr);
                return EXIT_FAILURE;
        }
 
-       if (u_object_module_init() != 0)
+       pkg = u_pkg_open(pkgname);
+       if (!pkg || !g_type_module_use(pkg)) {
+               fprintf(stderr, "%s: %s: failed to open package.\n",
+                               progname, pkgname);
                return EXIT_FAILURE;
+       }
+
+       if (!U_PKG(pkg)->pkg) {
+               if (u_pkg_is_native(pkg)) {
+                       fprintf(stderr, "%s: %s: not a UObject package.\n",
+                                       progname, pkgname);
+               } else {
+                       fprintf(stderr, "%s: %s: package not found.\n",
+                                       progname, pkgname);
+               }
 
-       pkg = upkg_fopen(argv[optind]);
-       if (!pkg) {
-               fprintf(stderr, "failed to open package!\n");
                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_type_module_unuse(pkg);
        u_object_module_exit();
+       u_pkg_vfs_exit();
        return rc;
 }