upkg: Fix missing return statement.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 16f16b2d8c14aca4b1db0f8f5d5e6584aecab2c5..6b48f72c92988277137e0702619bbb1e4d7a9041 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -262,9 +262,11 @@ static int package_list(GTypeModule *pkg, long parent)
 
                putchar('\n');
        }
+
+       return 0;
 }
 
-static int export_info(GTypeModule *pkg, unsigned long idx)
+static int object_info(GTypeModule *pkg, unsigned long idx)
 {
        struct upkg *upkg = U_PKG(pkg)->pkg;
        const struct upkg_export *export;
@@ -276,26 +278,62 @@ static int export_info(GTypeModule *pkg, unsigned long idx)
        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;
+               }
+
+               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("  %s: ", props[i]->name);
+                       fflush(stdout);
+
+                       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;
 }
 
-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) {
                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);
@@ -316,26 +354,52 @@ 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)
 {
+       struct upkg *upkg = U_PKG(pkg)->pkg;
+       GObject *obj;
+       int ret = -1;
+
+       obj = u_object_new_from_package(upkg, 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 < pkg->export_count; i++) {
-               class = upkg_export_class(pkg, i, &package);
+       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;
+               if (!type)
+                       continue;
 
                obj = g_object_new(type, NULL);
                if (U_OBJECT_IS_EXPORTABLE(obj)) {
-                       if (export(pkg, obj, i) != 0) {
+                       if (u_object_deserialize(obj, upkg, i) != 0
+                           || export(pkg, obj, i) != 0) {
                                ret = -1;
                        }
                }
@@ -400,13 +464,16 @@ static int process_object(int mode, const char *objname)
                if (current < 0)
                        ret = package_info(U_PKG(pkg)->pkg);
                else
-                       ret = export_info(pkg, current);
+                       ret = object_info(pkg, current);
                break;
        case MODE_LIST:
                ret = package_list(pkg, current+1);
                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();