X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/2cfc23174c99ea95a83cdca4e731949574b1e9c8..5f381395f22864d2c8213d2288d21aa2a2efbe0d:/src/upkg.c diff --git a/src/upkg.c b/src/upkg.c index 94ace92..989bf79 100644 --- a/src/upkg.c +++ b/src/upkg.c @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include #include @@ -28,6 +30,8 @@ #include #include #include +#include +#include enum { MODE_INFO, @@ -38,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' }, @@ -61,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) @@ -176,17 +181,19 @@ void print_guid(unsigned char guid[static 16]) void print_upkg_exports(struct upkg *pkg) { for (unsigned i = 0; i < pkg->export_count; i++) { - const char *name, *package, *class; + const struct upkg_export *export = upkg_get_export(pkg, i); + const char *package, *class; - name = upkg_export_name(pkg, i); class = upkg_export_class(pkg, i, &package); - if (!name || !class) + if (!class) continue; - 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)); + printf("%u - %s (%s.%s)\n", i+1, export->name, package, class); + printf(" Flags: %lx\n", export->flags); + if (verbose >= 2) { + print_upkg_object_flags(" ", export->flags); + } } } @@ -198,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)); } } @@ -215,11 +220,12 @@ 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) { + const struct upkg_export *export = upkg_get_export(pkg, idx); char name[256]; FILE *of; @@ -233,7 +239,7 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx) u_object_export_name(obj, name, sizeof name); - printf("exporting %s to %s\n", upkg_export_name(pkg, idx), name); + printf("exporting %s to %s\n", export->name, name); of = fopen(name, "wb"); if (!of) { perror(name); @@ -259,13 +265,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); @@ -274,25 +280,104 @@ 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) +{ + char work[strlen(objname)+1], *p = work, *c; + GTypeModule *pkg; + long current = -1; + int ret = 0; + + strcpy(work, objname); + + /* First, find and open the actual package. */ + c = strchr(p, '.'); + if (c) *c = 0; + + pkg = u_pkg_open(p); + if (!pkg || !g_type_module_use(pkg)) { + fprintf(stderr, "%s: %s: failed to open package.\n", + progname, work); + goto out; + } + + if (!U_PKG(pkg)->pkg) { + if (u_pkg_is_native(pkg)) { + fprintf(stderr, "%s: %s: not a UObject package.\n", + progname, work); + } else { + fprintf(stderr, "%s: %s: package not found.\n", + progname, work); + } + + goto out_unuse; + } + + /* Resolve the hierarchical reference. */ + while (c) { + p = c+1; + c = strchr(p, '.'); + if (c) *c = 0; + + current = upkg_export_find(U_PKG(pkg)->pkg, current, p); + if (current == -1) { + /* We want to print the full name up to this point. */ + strcpy(work, objname); + if (c) *c = 0; + + fprintf(stderr, "%s: %s: object not found.\n", + progname, work); + 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) { - struct upkg *pkg; + 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; @@ -314,30 +399,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; - - 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); - break; - case MODE_EXPORT: - rc = package_export(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; } - upkg_close(pkg); u_object_module_exit(); + u_pkg_vfs_exit(); return rc; }