]> git.draconx.ca Git - upkg.git/blobdiff - src/upkg.c
upkg: Add some error checking around upkg_export_get_class.
[upkg.git] / src / upkg.c
index 0e5a84e6dfe907d9ead33f2920b714129d0aa585..50f5ddab8491cab0787dd53f12025b2dbd8008e6 100644 (file)
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <assert.h>
 #include <getopt.h>
 
 #include <glib-object.h>
@@ -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);
@@ -214,41 +251,32 @@ 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));
                }
        }
 
        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);
@@ -262,6 +290,69 @@ static int package_list(GTypeModule *pkg, long parent)
 
                putchar('\n');
        }
+
+       return 0;
+}
+
+static int object_dump_properties(GTypeModule *pkg, unsigned long idx)
+{
+       GParamSpec **props;
+       GObject *obj;
+       unsigned n;
+
+       obj = u_object_new_from_package(pkg, 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;
+
+               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);
+
+                       if (obj && obj->pkg_name) {
+                               printf(" %s", obj->pkg_name);
+                       }
+               }
+
+               valstr = g_strdup_value_contents(&val);
+               printf(" %s\n", valstr);
+               g_free(valstr);
+       }
+
+       g_free(props);
+       g_object_unref(obj);
+
+       return 0;
+}
+
+static int object_dump_offsets(GTypeModule *pkg, unsigned long idx)
+{
+       struct upkg_file *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)
@@ -269,44 +360,24 @@ 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);
-       printf(" (%s.%s)\n", package, class);
-
-       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;
-               }
+       if (class)
+               printf(" (%s.%s)\n", package, class);
+       else
+               printf(" (failed to get class)\n");
 
-               props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
-               for (unsigned i = 0; i < n; i++) {
-                       GValue val = {0};
-                       char *valstr;
+       if (verbose >= 1 && object_dump_properties(pkg, idx) != 0)
+               ret = -1;
 
-                       printf("  %s: ", props[i]->name);
-                       fflush(stdout);
+       if (verbose >= 3 && object_dump_offsets(pkg, idx))
+               ret = -1;
 
-                       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);
-               }
-               free(props);
-
-               g_object_unref(obj);
-       }
-
-       return 0;
+       return ret;
 }
 
 static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
@@ -314,17 +385,21 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
        struct upkg *upkg = U_PKG(pkg)->pkg;
        char name[256];
        FILE *of;
+       int rc;
 
-       if (u_object_deserialize(obj, upkg, 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);
@@ -349,29 +424,38 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
        return 0;
 }
 
+static int object_export(GTypeModule *pkg, unsigned long idx)
+{
+       GObject *obj;
+       int ret = -1;
+
+       obj = u_object_new_from_package(pkg, idx);
+       if (!obj) {
+               fprintf(stderr, "%s: failed to load object.\n", progname);
+               return -1;
+       }
+
+       if (!U_OBJECT_IS_EXPORTABLE(obj)) {
+               fprintf(stderr, "%s: object is not exportable.\n", progname);
+               goto out;
+       }
+
+       ret = export(pkg, obj, idx);
+out:
+       g_object_unref(obj);
+       return ret;
+}
+
 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 (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);
        }
@@ -437,10 +521,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(pkg);
+               if (current < 0)
+                       ret = package_export(pkg);
+               else
+                       ret = object_export(pkg, current);
                break;
        default:
                abort();