upkg: Embed struct upkg into the private structure.

[upkg.git] / src / upkg.h

diff --git a/src/upkg.h b/src/upkg.h
index 7565b3244d8b4f01a6c5cea264026238aaf9e720..044b10779a1d58b9013c7e5a76420258a3c7fbdb 100644 (file)
--- a/src/upkg.h
+++ b/src/upkg.h
@@ -62,14 +62,24 @@
 #define UPKG_HDR_MAGIC 0x9e2a83c1
 #define UPKG_HDR_SIZE  36
 
+struct upkg_file_ops {
+       size_t (*read)(void *buf, size_t size, void *handle);
+       int    (*seek)(void *handle, long offset, int whence);
+       long   (*tell)(void *handle);
+       int    (*eof) (void *handle);
+};
+
 struct upkg {
        unsigned version, license;
        unsigned char guid[16];
        unsigned long flags;
 
        unsigned long name_count, export_count, import_count;
+};
 
-       struct upkg_private *priv;
+struct upkg_export {
+       const char *name;
+       unsigned long flags;
 };
 
 struct upkg_file {
@@ -77,19 +87,23 @@ struct upkg_file {
 
        int eof;
 
-       struct upkg *pkg;
+       struct upkg_priv *pkg;
        unsigned long base, offset, len;
 };
 
+/* Default I/O operations for ordinary files. */
+extern const struct upkg_file_ops upkg_default_fops;
+
+struct upkg *upkg_open(void *handle, const struct upkg_file_ops *fops,
+                       int (*destructor)(void *handle));
 struct upkg *upkg_fopen(const char *path);
 int upkg_close(struct upkg *pkg);
 
 const char *upkg_get_name(struct upkg *pkg, unsigned long idx);
+const struct upkg_export *upkg_get_export(struct upkg *pkg, unsigned long idx);
 
-long   upkg_export_find(struct upkg *pkg, const char *name);
+long upkg_export_find(struct upkg *pkg, long parent, const char *name);
 
-unsigned long upkg_export_flags(struct upkg *pkg, unsigned long idx);
-const char *upkg_export_name(struct upkg *pkg, unsigned long idx);
 const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
                               const char **package);