upkg: Add support for listing package imports.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 5a51c2e2203717e6eaa822a94aeb9c338ca092f9..d44422cd5ee92aa8db5fc2c9a2dfc6ff1d09a288 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -181,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++) {
@@ -200,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);
@@ -222,25 +258,11 @@ 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, 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(U_PKG(pkg)->pkg, export);
-}
-
 static int package_list(GTypeModule *pkg, long current)
 {
        struct upkg *upkg = U_PKG(pkg)->pkg;
@@ -290,7 +312,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                GObject *obj;
                unsigned n;
 
-               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);
@@ -311,8 +333,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                        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) {
+                               if (obj && obj->pkg_name) {
                                        printf(" %s", obj->pkg_name);
                                }
                        }
@@ -391,11 +412,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;
@@ -415,28 +435,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);
        }