struct upkg_export_priv {
struct upkg_export pub;
- long package, class, super;
+ long class, super;
unsigned long size, offset;
};
len += rc;
if (nbuf-len < 4) goto err;
- export->package = unpack_s32_le(buf+len);
+ export->pub.package = unpack_s32_le(buf+len);
len += 4;
rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
struct upkg_export_priv *e = &pkg->exports[i];
/* Assertion: an object's package is an export. */
- format_assert(e->package >= 0, continue);
- if (e->package == package && strcmp(e->pub.name, name) == 0) {
+ format_assert(e->pub.package >= 0, continue);
+ if (e->pub.package == package
+ && strcmp(e->pub.name, name) == 0) {
return i;
}
}
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 int export_info(GTypeModule *pkg, unsigned long idx)
+{
+ struct upkg *upkg = U_PKG(pkg)->pkg;
+ const struct upkg_export *export;
+
+ export = upkg_get_export(upkg, idx);
+
+ printf("%s", pkg->name);
+ export_print_name(upkg, export);
+ putchar('\n');
+
+ return 0;
+}
+
static int export(struct upkg *pkg, GObject *obj, unsigned idx)
{
const struct upkg_export *export = upkg_get_export(pkg, idx);
switch (mode) {
case MODE_INFO:
- ret = package_info(U_PKG(pkg)->pkg);
+ if (current < 0)
+ ret = package_info(U_PKG(pkg)->pkg);
+ else
+ ret = export_info(pkg, current);
break;
case MODE_EXPORT:
ret = package_export(U_PKG(pkg)->pkg);