putchar('\n');
}
+
+ return 0;
}
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;
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_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;
}
FILE *of;
int rc;
- if (u_object_deserialize(obj, upkg, idx) != 0) {
- return -1;
- }
-
if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
return -1;
}
return 0;
}
+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;
}
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(pkg);
+ if (current < 0)
+ ret = package_export(pkg);
+ else
+ ret = object_export(pkg, current);
break;
default:
abort();