putchar('\n');
}
+
+ return 0;
}
static int object_info(GTypeModule *pkg, unsigned long idx)
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);
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;
}
}
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();