X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/559bcf15ef66d20d7e8527c690c0b4e5a66b6381..8afa7b7717a5a2f45182a63d043401960fdeef92:/src/upkg.c diff --git a/src/upkg.c b/src/upkg.c index c13a867..176eca9 100644 --- a/src/upkg.c +++ b/src/upkg.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -214,7 +215,7 @@ int package_info(struct upkg *pkg) 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)); + printf("%lu - %s\n", i, upkg_get_name(pkg, i)); } } @@ -228,7 +229,7 @@ int package_info(struct upkg *pkg) 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)); + export_print_name(upkg, e->parent); printf(".%s", e->name); } } @@ -240,15 +241,20 @@ export_print_fullname(GTypeModule *pkg, const struct upkg_export *export) 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); @@ -262,6 +268,8 @@ static int package_list(GTypeModule *pkg, long parent) putchar('\n'); } + + return 0; } static int object_info(GTypeModule *pkg, unsigned long idx) @@ -276,6 +284,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx) class = upkg_export_class(upkg, idx, &package); printf(" (%s.%s)\n", package, class); + /* Print out object properties. */ if (verbose >= 1) { GParamSpec **props; GObject *obj; @@ -293,39 +302,73 @@ static int object_info(GTypeModule *pkg, unsigned long idx) GValue val = {0}; char *valstr; - printf(" %s: ", props[i]->name); + 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); + + if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) { + UObject *obj = g_value_get_object(&val); + + /* TODO: Display full object names here. */ + if (obj->pkg_name) { + printf(" %s", obj->pkg_name); + } + } + valstr = g_strdup_value_contents(&val); - printf("%s\n", valstr); + printf(" %s\n", valstr); + g_free(valstr); } free(props); g_object_unref(obj); } + /* 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; + } + + 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 export(struct upkg *pkg, GObject *obj, unsigned idx) +static int export(GTypeModule *pkg, GObject *obj, unsigned idx) { - const struct upkg_export *export = upkg_get_export(pkg, idx); + struct upkg *upkg = U_PKG(pkg)->pkg; char name[256]; FILE *of; + int rc; - if (u_object_deserialize(obj, pkg, idx) != 0) { + if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) { + fprintf(stderr, "%s: failed to load export data.\n", progname); return -1; } - if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) { + rc = u_object_export_name(obj, name, sizeof name); + if (rc <= 0) { + /* XXX: We could use a default name here. */ + fprintf(stderr, "%s: failed to determine export filename.\n", + progname); return -1; } - u_object_export_name(obj, name, sizeof name); + printf("exporting "); + export_print_fullname(pkg, upkg_get_export(upkg, idx)); + printf(" to %s\n", name); - printf("exporting %s to %s\n", export->name, name); of = fopen(name, "wb"); if (!of) { perror(name); @@ -346,28 +389,39 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx) return 0; } -int package_export(struct upkg *pkg) +static int object_export(GTypeModule *pkg, unsigned long idx) { - const char *class, *package; + struct upkg *upkg = U_PKG(pkg)->pkg; GObject *obj; - GType type; - int ret = 0; + int ret = -1; - 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 -1; - } + obj = u_object_new_from_package(upkg, idx); + if (!obj) { + fprintf(stderr, "%s: failed to load object.\n", progname); + return -1; + } - type = u_object_module_get_class(package, class); - if (!type) continue; + if (!U_OBJECT_IS_EXPORTABLE(obj)) { + fprintf(stderr, "%s: object is not exportable.\n", progname); + goto out; + } - obj = g_object_new(type, NULL); - if (U_OBJECT_IS_EXPORTABLE(obj)) { - if (export(pkg, obj, i) != 0) { - ret = -1; - } + ret = export(pkg, obj, idx); +out: + g_object_unref(obj); + return ret; +} + +int package_export(GTypeModule *pkg) +{ + struct upkg *upkg = U_PKG(pkg)->pkg; + GObject *obj; + int ret = 0; + + for (unsigned i = 0; i < upkg->export_count; i++) { + obj = u_object_new_from_package(upkg, i); + if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) { + ret = -1; } g_object_unref(obj); } @@ -433,10 +487,13 @@ 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: - ret = package_export(U_PKG(pkg)->pkg); + if (current < 0) + ret = package_export(pkg); + else + ret = object_export(pkg, current); break; default: abort();