upkg: Embed struct upkg into the private structure.

[upkg.git] / src / upkg.h

diff --git a/src/upkg.h b/src/upkg.h
index 31615ff2b43ef2c84a4eca82b9fbf2184c76976b..044b10779a1d58b9013c7e5a76420258a3c7fbdb 100644 (file)
--- a/src/upkg.h
+++ b/src/upkg.h
@@ -2,9 +2,9 @@
  *  upkg: tool for manipulating Unreal Tournament packages.
  *  Copyright (C) 2009 Nick Bowler
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UPKG_H_
@@ -63,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 {
@@ -78,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);