struct upkg_export_priv {
struct upkg_export pub;
- long class, super;
+ long super;
unsigned long size, offset;
};
-struct upkg_import {
- const char *class_package, *class_name, *object_name;
- long package;
-};
-
struct upkg_priv {
struct upkg pub;
* Stores the result in *val and returns the number of input bytes read (or 0
* if the input is invalid, in which case *val is undefined).
*/
-size_t upkg_decode_index(long *val, unsigned char *bytes, size_t n)
+size_t upkg_decode_index(long *val, const unsigned char *bytes, size_t n)
{
*val = 0;
}
len = 0;
- rc = upkg_decode_index(&export->class, buf+len, nbuf-len);
+ rc = upkg_decode_index(&export->pub.class, buf+len, nbuf-len);
if (rc == 0) goto err;
len += rc;
len += rc;
if (nbuf-len < 4) goto err;
- export->pub.package = unpack_s32_le(buf+len);
+ tmp = unpack_s32_le(buf+len);
+ if (tmp < 0)
+ goto err;
len += 4;
+ export->pub.parent = NULL;
+ if (tmp > 0) {
+ tmp--;
+ if (tmp >= pkg->pub.export_count)
+ goto err;
+ export->pub.parent = &pkg->exports[tmp].pub;
+ }
+
rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
if (rc == 0 || tmp < 0 || tmp >= pkg->pub.name_count) goto err;
export->pub.name = pkg->names[tmp].name;
len += rc;
if (nbuf-len < 4) goto err;
- import->package = unpack_s32_le(buf+len);
+ tmp = unpack_s32_le(buf+len);
+ if (tmp > 0)
+ goto err;
len += 4;
+ import->parent = NULL;
+ if (tmp < 0) {
+ tmp = -(tmp + 1);
+ if (tmp >= pkg->pub.import_count)
+ goto err;
+ import->parent = &pkg->imports[tmp];
+ }
+
rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
if (rc == 0 || len >= pkg->pub.name_count) goto err;
- import->object_name = pkg->names[tmp].name;
+ import->name = pkg->names[tmp].name;
len += rc;
nbuf -= len;
return pkg->names[idx].name;
}
-long upkg_export_find(struct upkg *pub, long parent, const char *name)
+long upkg_export_find(struct upkg *pub, long parent_index, const char *name)
{
struct upkg_priv *pkg = (struct upkg_priv *)pub;
+ struct upkg_export *parent = NULL;
- /* This only makes sense if the assertion below is not violated. */
- long package = parent < 0 ? 0 : parent + 1;
+ if (parent_index >= 0) {
+ if (parent_index >= pkg->pub.export_count)
+ return -1;
+ parent = &pkg->exports[parent_index].pub;
+ }
for (unsigned long i = 0; i < pkg->pub.export_count; i++) {
struct upkg_export_priv *e = &pkg->exports[i];
- /* Assertion: an object's package is an export. */
- format_assert(e->pub.package >= 0, continue);
- if (e->pub.package == package
- && strcmp(e->pub.name, name) == 0) {
+ if (e->pub.parent == parent && !strcmp(e->pub.name, name))
return i;
- }
}
return -1;
return NULL;
}
-const char *upkg_export_class(struct upkg *pub, unsigned long idx,
- const char **package)
+const struct upkg_import *upkg_get_import(struct upkg *pub, unsigned long idx)
{
struct upkg_priv *pkg = (struct upkg_priv *)pub;
- struct upkg_export_priv *export;
- struct upkg_import *iclass, *ipackage;
- unsigned long pkg_idx;
-
- if (idx >= pkg->pub.export_count)
- return NULL;
-
- export = &pkg->exports[idx];
- /* Assumption: class references are always imports. */
- format_assert(export->class <= 0, return NULL);
-
- /* Get the class. */
- if (export->class == 0) {
- if (package) *package = "Core";
- return "Class";
- }
-
- pkg_idx = -(export->class + 1);
- if (pkg_idx >= pkg->pub.import_count)
- return NULL;
- iclass = &pkg->imports[pkg_idx];
-
- /* Assumption: class references are always Core.Class. */
- format_assert(!strcmp(iclass->class_package, "Core"), return NULL);
- format_assert(!strcmp(iclass->class_name, "Class"), return NULL);
-
- /* Assumption: package references are always imports. */
- format_assert(iclass->package <= 0, return NULL);
-
- /* Get the package. */
- pkg_idx = -(iclass->package + 1);
- if (pkg_idx >= pkg->pub.import_count)
- return NULL;
- ipackage = &pkg->imports[pkg_idx];
-
- /* Assumption: package references are always Core.Package. */
- format_assert(!strcmp(ipackage->class_package, "Core"), return NULL);
- format_assert(!strcmp(ipackage->class_name, "Package"), return NULL);
-
- if (package) *package = ipackage->object_name;
- return iclass->object_name;
+ if (idx < pkg->pub.import_count)
+ return &pkg->imports[idx];
+ return NULL;
}
struct upkg_file *upkg_export_open(struct upkg *pub, unsigned long idx)
return NULL;
*f = (struct upkg_file) {
- .pkg = pkg,
+ .pkg = pub,
.base = pkg->exports[idx].offset,
.len = pkg->exports[idx].size,
.name = pkg->exports[idx].pub.name,
void upkg_export_close(struct upkg_file *f)
{
- if (f->pkg->last_file == f)
- f->pkg->last_file = NULL;
+ struct upkg_priv *pkg = (struct upkg_priv *)f->pkg;
+
+ if (pkg->last_file == f)
+ pkg->last_file = NULL;
free(f);
}
int upkg_export_seek(struct upkg_file *f, long offset, int whence)
{
- const struct upkg_file_ops *fops = f->pkg->fops;
+ struct upkg_priv *pkg = (struct upkg_priv *)f->pkg;
+ const struct upkg_file_ops *fops = pkg->fops;
int rc = EOF;
switch (whence) {
case SEEK_SET:
if (offset < 0 || offset > f->len)
return EOF;
- rc = fops->seek(f->pkg->f, f->base + offset, SEEK_SET);
+ rc = fops->seek(pkg->f, f->base + offset, SEEK_SET);
break;
case SEEK_END:
offset = -offset;
if (offset < 0 || offset > f->len)
return EOF;
offset = f->len - offset;
- rc = fops->seek(f->pkg->f, f->base + offset, SEEK_SET);
+ rc = fops->seek(pkg->f, f->base + offset, SEEK_SET);
break;
}
if (rc == 0) {
- f->pkg->last_file = f;
+ pkg->last_file = f;
f->offset = offset;
f->eof = 0;
- } else if (f->pkg->last_file == f) {
- f->pkg->last_file = NULL;
+ } else if (pkg->last_file == f) {
+ pkg->last_file = NULL;
}
return rc;
size_t upkg_export_read(struct upkg_file *f, void *buf, size_t n)
{
- const struct upkg_file_ops *fops = f->pkg->fops;
+ struct upkg_priv *pkg = (struct upkg_priv *)f->pkg;
+ const struct upkg_file_ops *fops = pkg->fops;
size_t want = MIN(n, f->len - f->offset);
size_t rc;
return 0;
}
- if (f != f->pkg->last_file) {
- if (fops->seek(f->pkg->f, f->base + f->offset, SEEK_SET))
+ if (f != pkg->last_file) {
+ if (fops->seek(pkg->f, f->base + f->offset, SEEK_SET))
return 0;
}
- rc = fops->read(buf, want, f->pkg->f);
+ rc = fops->read(buf, want, pkg->f);
f->offset += rc;
- if (want < n || (rc < want && fops->eof(f->pkg->f)))
+ if (want < n || (rc < want && fops->eof(pkg->f)))
f->eof = 1;
return rc;
}