X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/bb37d402fddbdae411fbc276ed5af9dee864aa67..d42bc5c2d8dcf388b424c5bbc4b6f25416f689f1:/src/upkg.c diff --git a/src/upkg.c b/src/upkg.c index dbaa3fd..50f5dda 100644 --- a/src/upkg.c +++ b/src/upkg.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -180,6 +181,31 @@ void print_guid(unsigned char guid[static 16]) } } +static void export_print_name(const struct upkg_export *e) +{ + if (e) { + export_print_name(e->parent); + printf(".%s", e->name); + } +} + +static void +export_print_fullname(GTypeModule *pkg, const struct upkg_export *export) +{ + printf("%s", pkg->name); + export_print_name(export); +} + +static void import_print_fullname(const struct upkg_import *import) +{ + if (import) { + import_print_fullname(import->parent); + if (import->parent) + putchar('.'); + printf("%s", import->name); + } +} + void print_upkg_exports(struct upkg *pkg) { for (unsigned i = 0; i < pkg->export_count; i++) { @@ -199,6 +225,17 @@ void print_upkg_exports(struct upkg *pkg) } } +void print_upkg_imports(struct upkg *pkg) +{ + for (unsigned i = 0; i < pkg->import_count; i++) { + const struct upkg_import *import = upkg_get_import(pkg, i); + + printf("%u - ", i); + import_print_fullname(import); + printf(" (%s.%s)\n", import->class_package, import->class_name); + } +} + int package_info(struct upkg *pkg) { printf("Version: %u\n", pkg->version); @@ -221,34 +258,25 @@ int package_info(struct upkg *pkg) printf("Exports: %lu\n", pkg->export_count); if (verbose >= 1) print_upkg_exports(pkg); printf("Imports: %lu\n", pkg->import_count); + if (verbose >= 1) print_upkg_imports(pkg); return 0; } -static void export_print_name(struct upkg *upkg, const struct upkg_export *e) -{ - if (e) { - export_print_name(upkg, upkg_get_export(upkg, e->package-1)); - printf(".%s", e->name); - } -} - -static void -export_print_fullname(GTypeModule *pkg, const struct upkg_export *export) -{ - printf("%s", pkg->name); - export_print_name(U_PKG(pkg)->pkg, export); -} - -static int package_list(GTypeModule *pkg, long parent) +static int package_list(GTypeModule *pkg, long current) { struct upkg *upkg = U_PKG(pkg)->pkg; - const struct upkg_export *export; + const struct upkg_export *parent = NULL; + + if (current >= 0) { + parent = upkg_get_export(upkg, current); + assert(parent != NULL); + } for (unsigned i = 0; i < upkg->export_count; i++) { - export = upkg_get_export(upkg, i); + const struct upkg_export *export = upkg_get_export(upkg, i); - if (export->package != parent) + if (export->parent != parent) continue; export_print_fullname(pkg, export); @@ -266,68 +294,92 @@ static int package_list(GTypeModule *pkg, long parent) return 0; } -static int object_info(GTypeModule *pkg, unsigned long idx) +static int object_dump_properties(GTypeModule *pkg, unsigned long idx) { - struct upkg *upkg = U_PKG(pkg)->pkg; - const struct upkg_export *export; - const char *class, *package; + GParamSpec **props; + GObject *obj; + unsigned n; - export = upkg_get_export(upkg, idx); - export_print_fullname(pkg, export); + obj = u_object_new_from_package(pkg, idx); + if (!obj) { + fprintf(stderr, "%s: failed to load object.\n", progname); + return -1; + } - class = upkg_export_class(upkg, idx, &package); - printf(" (%s.%s)\n", package, class); - - /* Print out object properties. */ - if (verbose >= 1) { - GParamSpec **props; - GObject *obj; - unsigned n; - - obj = u_object_new_from_package(upkg, idx); - if (!obj) { - fprintf(stderr, "%s: failed to load object.\n", - progname); - return -1; - } + props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n); + for (unsigned i = 0; i < n; i++) { + GValue val = {0}; + char *valstr; - props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n); - for (unsigned i = 0; i < n; i++) { - GValue val = {0}; - char *valstr; + printf(" property %s:", props[i]->name); + fflush(stdout); - printf(" property %s: ", props[i]->name); - fflush(stdout); + g_value_init(&val, props[i]->value_type); + g_object_get_property(obj, props[i]->name, &val); - g_value_init(&val, props[i]->value_type); - g_object_get_property(obj, props[i]->name, &val); - valstr = g_strdup_value_contents(&val); - printf("%s\n", valstr); + if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) { + UObject *obj = g_value_get_object(&val); + + if (obj && obj->pkg_name) { + printf(" %s", obj->pkg_name); + } } - free(props); - g_object_unref(obj); + valstr = g_strdup_value_contents(&val); + printf(" %s\n", valstr); + g_free(valstr); } - /* 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; - } + g_free(props); + g_object_unref(obj); + + return 0; +} - printf(" file size: %lu\n", f->len); - printf(" file start: %#lx\n", f->base); - printf(" file end: %#lx\n", f->base + f->len); +static int object_dump_offsets(GTypeModule *pkg, unsigned long idx) +{ + struct upkg_file *f; - upkg_export_close(f); + f = upkg_export_open(U_PKG(pkg)->pkg, 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 object_info(GTypeModule *pkg, unsigned long idx) +{ + struct upkg *upkg = U_PKG(pkg)->pkg; + const struct upkg_export *export; + const char *class, *package; + int ret = 0; + + export = upkg_get_export(upkg, idx); + export_print_fullname(pkg, export); + + class = upkg_export_class(upkg, idx, &package); + if (class) + printf(" (%s.%s)\n", package, class); + else + printf(" (failed to get class)\n"); + + if (verbose >= 1 && object_dump_properties(pkg, idx) != 0) + ret = -1; + + if (verbose >= 3 && object_dump_offsets(pkg, idx)) + ret = -1; + + return ret; +} + static int export(GTypeModule *pkg, GObject *obj, unsigned idx) { struct upkg *upkg = U_PKG(pkg)->pkg; @@ -374,11 +426,10 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx) 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); + obj = u_object_new_from_package(pkg, idx); if (!obj) { fprintf(stderr, "%s: failed to load object.\n", progname); return -1; @@ -398,28 +449,13 @@ out: 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 < 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; - - obj = g_object_new(type, NULL); - if (U_OBJECT_IS_EXPORTABLE(obj)) { - if (u_object_deserialize(obj, upkg, i) != 0 - || export(pkg, obj, i) != 0) { - ret = -1; - } + obj = u_object_new_from_package(pkg, i); + if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) { + ret = -1; } g_object_unref(obj); } @@ -485,7 +521,7 @@ static int process_object(int mode, const char *objname) ret = object_info(pkg, current); break; case MODE_LIST: - ret = package_list(pkg, current+1); + ret = package_list(pkg, current); break; case MODE_EXPORT: if (current < 0)