X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/bc5c414abd86bb2eb06a5f48ad93d953b99cc020..d2ff3349e261109e18d20cff1a236d3ac573ad58:/src/libupkg.c

diff --git a/src/libupkg.c b/src/libupkg.c
index 6012f09..40b3913 100644
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -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/>.
  */
 
 #include <stdio.h>
@@ -45,7 +44,9 @@ struct upkg_import {
 };
 
 struct upkg_private {
-	FILE *f;
+	const struct upkg_file_ops *fops;
+	int (*dtor)(void *handle);
+	void *f;
 
 	struct upkg_file *last_file;
 
@@ -57,6 +58,39 @@ struct upkg_private {
 	unsigned char guid[16];
 };
 
+/* Default I/O operations for ordinary files. */
+static size_t file_read(void *buf, size_t size, void *handle)
+{
+	return fread(buf, 1, size, (FILE *)handle);
+}
+
+static int file_seek(void *handle, long offset, int whence)
+{
+	return fseek((FILE *)handle, offset, whence);
+}
+
+static long file_tell(void *handle)
+{
+	return ftell((FILE *)handle);
+}
+
+static int file_eof(void *handle)
+{
+	return feof((FILE *)handle);
+}
+
+static int file_close(void *handle)
+{
+	return fclose((FILE *)handle);
+}
+
+const struct upkg_file_ops upkg_default_fops = {
+	.read = file_read,
+	.seek = file_seek,
+	.tell = file_tell,
+	.eof  = file_eof,
+};
+
 /*
  * Decode the compact index format from the upkg.  This format is fucked.
  * Stores the result in *val and returns the number of input bytes read (or 0
@@ -126,13 +160,14 @@ static struct upkg *init_upkg(unsigned char hdr[static UPKG_HDR_SIZE])
 
 static int pkg_init_guid(struct upkg *pkg)
 {
+	const struct upkg_file_ops *fops = pkg->priv->fops;
 	size_t rc;
 
 	if (pkg->version < 68) {
 		unsigned long heritage_count, heritage_offset;
 		unsigned char buf[8];
 
-		rc = fread(buf, 1, sizeof buf, pkg->priv->f);
+		rc = fops->read(buf, sizeof buf, pkg->priv->f);
 		if (rc < 8)
 			return -1;
 
@@ -141,11 +176,11 @@ static int pkg_init_guid(struct upkg *pkg)
 
 		if (heritage_count == 0)
 			return -1;
-		if (fseek(pkg->priv->f, heritage_offset, SEEK_SET) != 0)
+		if (fops->seek(pkg->priv->f, heritage_offset, SEEK_SET) != 0)
 			return -1;
 	}
 
-	rc = fread(pkg->guid, 1, 16, pkg->priv->f);
+	rc = fops->read(pkg->guid, 16, pkg->priv->f);
 	if (rc < 16)
 		return -1;
 
@@ -154,11 +189,14 @@ static int pkg_init_guid(struct upkg *pkg)
 
 static int pkg_init_names(struct upkg *pkg)
 {
+	const struct upkg_file_ops *fops = pkg->priv->fops;
+	void *f = pkg->priv->f;
+
 	size_t rc, len, nbuf = 0;
 	unsigned long index = 0;
 	unsigned char buf[512];
 
-	if (fseek(pkg->priv->f, pkg->priv->name_offset, SEEK_SET) != 0)
+	if (fops->seek(f, pkg->priv->name_offset, SEEK_SET) != 0)
 		return -1;
 
 	pkg->priv->names = malloc(pkg->name_count * sizeof *pkg->priv->names);
@@ -169,9 +207,9 @@ static int pkg_init_names(struct upkg *pkg)
 		struct upkg_name *name = &pkg->priv->names[index];
 
 		/* Read some data into buffer. */
-		if (!feof(pkg->priv->f)) {
-			rc = fread(buf+nbuf, 1, sizeof buf-nbuf, pkg->priv->f);
-			if (rc == 0)
+		if (!fops->eof(pkg->priv->f)) {
+			rc = fops->read(buf+nbuf, sizeof buf-nbuf, f);
+			if (rc == 0 && nbuf == 0)
 				goto err;
 			nbuf += rc;
 		}
@@ -218,11 +256,14 @@ err:
 
 static int pkg_init_exports(struct upkg *pkg)
 {
+	const struct upkg_file_ops *fops = pkg->priv->fops;
+	void *f = pkg->priv->f;
+
 	size_t rc, len, nbuf = 0;
 	unsigned long index = 0;
 	unsigned char buf[512];
 
-	if (fseek(pkg->priv->f, pkg->priv->export_offset, SEEK_SET) != 0)
+	if (fops->seek(f, pkg->priv->export_offset, SEEK_SET) != 0)
 		return -1;
 
 	pkg->priv->exports = malloc(pkg->export_count * sizeof *pkg->priv->exports);
@@ -234,9 +275,9 @@ static int pkg_init_exports(struct upkg *pkg)
 		long tmp;
 
 		/* Read some data into buffer. */
-		if (!feof(pkg->priv->f)) {
-			rc = fread(buf+nbuf, 1, sizeof buf-nbuf, pkg->priv->f);
-			if (rc == 0)
+		if (!fops->eof(pkg->priv->f)) {
+			rc = fops->read(buf+nbuf, sizeof buf-nbuf, f);
+			if (rc == 0 && nbuf == 0)
 				goto err;
 			nbuf += rc;
 		}
@@ -251,7 +292,7 @@ static int pkg_init_exports(struct upkg *pkg)
 		len += rc;
 
 		if (nbuf-len < 4) goto err;
-		export->package = unpack_32_le(buf+len);
+		export->package = unpack_s32_le(buf+len);
 		len += 4;
 
 		rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
@@ -288,11 +329,14 @@ err:
 
 static int pkg_init_imports(struct upkg *pkg)
 {
+	const struct upkg_file_ops *fops = pkg->priv->fops;
+	void *f = pkg->priv->f;
+
 	size_t rc, len, nbuf = 0;
 	unsigned long index = 0;
 	unsigned char buf[512];
 
-	if (fseek(pkg->priv->f, pkg->priv->import_offset, SEEK_SET) != 0)
+	if (fops->seek(f, pkg->priv->import_offset, SEEK_SET) != 0)
 		return -1;
 
 	pkg->priv->imports = malloc(pkg->import_count * sizeof *pkg->priv->imports);
@@ -304,30 +348,30 @@ static int pkg_init_imports(struct upkg *pkg)
 		long tmp;
 
 		/* Read some data into buffer. */
-		if (!feof(pkg->priv->f)) {
-			rc = fread(buf+nbuf, 1, sizeof buf-nbuf, pkg->priv->f);
-			if (rc == 0)
+		if (!fops->eof(pkg->priv->f)) {
+			rc = fops->read(buf+nbuf, sizeof buf-nbuf, f);
+			if (rc == 0 && nbuf == 0)
 				goto err;
 			nbuf += rc;
 		}
 
 		len = 0;
 		rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
-		if (rc == 0 || len < 0 || len >= pkg->name_count) goto err;
+		if (rc == 0 || len >= pkg->name_count) goto err;
 		import->class_package = pkg->priv->names[tmp].name;
 		len += rc;
 
 		rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
-		if (rc == 0 || len < 0 || len >= pkg->name_count) goto err;
+		if (rc == 0 || len >= pkg->name_count) goto err;
 		import->class_name = pkg->priv->names[tmp].name;
 		len += rc;
 
 		if (nbuf-len < 4) goto err;
-		import->package = unpack_32_le(buf+len);
+		import->package = unpack_s32_le(buf+len);
 		len += 4;
 
 		rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
-		if (rc == 0 || len < 0 || len >= pkg->name_count) goto err;
+		if (rc == 0 || len >= pkg->name_count) goto err;
 		import->object_name = pkg->priv->names[tmp].name;
 		len += rc;
 
@@ -342,69 +386,84 @@ err:
 	return -1;
 }
 
-struct upkg *upkg_fopen(const char *path)
+struct upkg *upkg_open(void *f, const struct upkg_file_ops *fops,
+                       int (*destructor)(void *handle))
 {
 	unsigned char hdr_buf[UPKG_HDR_SIZE];
 	struct upkg *pkg;
-	FILE *f;
 
-	if (!(f = fopen(path, "rb"))) {
+	if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
 		return NULL;
 	}
-	if (fread(hdr_buf, sizeof hdr_buf, 1, f) != 1) {
-		goto err1;
-	}
 	if (unpack_32_le(hdr_buf) != UPKG_HDR_MAGIC) {
-		goto err1;
+		return NULL;
 	}
 
 	/* Initialize package structure. */
 	pkg = init_upkg(hdr_buf);
 	if (!pkg) {
-		goto err1;
+		return NULL;
 	}
-	pkg->priv->f = f;
+	pkg->priv->fops = fops;
+	pkg->priv->dtor = destructor;
+	pkg->priv->f    = f;
 
 	if (pkg_init_guid(pkg) != 0) {
-		goto err2;
+		goto err1;
 	}
 
 	if (pkg_init_names(pkg) != 0) {
-		goto err2;
+		goto err1;
 	}
 
 	if (pkg_init_exports(pkg) != 0) {
-		goto err3;
+		goto err2;
 	}
 
 	if (pkg_init_imports(pkg) != 0) {
-		goto err4;
+		goto err3;
 	}
 
 	return pkg;
-err4:
-	free(pkg->priv->exports);
 err3:
+	free(pkg->priv->exports);
+err2:
 	for (unsigned i = 0; i < pkg->name_count; i++)
 		free(pkg->priv->names[i].name);
 	free(pkg->priv->names);
-err2:
-	free(pkg);
 err1:
-	fclose(f);
+	free(pkg);
 	return NULL;
 }
 
+struct upkg *upkg_fopen(const char *path)
+{
+	struct upkg *pkg;
+	FILE *f;
+
+	f = fopen(path, "rb");
+	if (!f) {
+		return NULL;
+	}
+
+	pkg = upkg_open(f, &upkg_default_fops, file_close);
+	if (!pkg) {
+		fclose(f);
+	}
+
+	return pkg;
+}
+
 int upkg_close(struct upkg *pkg)
 {
 	int rc = 0;
 
-	if (pkg->priv->f) {
-		rc = fclose(pkg->priv->f);
+	if (pkg->priv->dtor) {
+		rc = pkg->priv->dtor(pkg->priv->f);
+	}
 
-		for (unsigned i = 0; i < pkg->name_count; i++) {
-			free(pkg->priv->names[i].name);
-		}
+	for (unsigned i = 0; i < pkg->name_count; i++) {
+		free(pkg->priv->names[i].name);
 	}
 
 	free(pkg->priv->imports);
@@ -436,6 +495,13 @@ long upkg_export_find(struct upkg *pkg, const char *name)
 	return -1;
 }
 
+unsigned long upkg_export_flags(struct upkg *pkg, unsigned long idx)
+{
+	if (idx < pkg->export_count)
+		return pkg->priv->exports[idx].flags;
+	return 0;
+}
+
 const char *upkg_export_name(struct upkg *pkg, unsigned long idx)
 {
 	if (idx < pkg->export_count)
@@ -452,7 +518,7 @@ const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
 
 	if (idx >= pkg->export_count)
 		return NULL;
-	
+
 	export = &pkg->priv->exports[idx];
 
 	/* ASSUMPTION: class references are always imports */
@@ -535,6 +601,7 @@ long upkg_export_tell(struct upkg_file *f)
 
 int upkg_export_seek(struct upkg_file *f, long offset, int whence)
 {
+	const struct upkg_file_ops *fops = f->pkg->priv->fops;
 	int rc = EOF;
 
 	switch (whence) {
@@ -543,14 +610,14 @@ int upkg_export_seek(struct upkg_file *f, long offset, int whence)
 	case SEEK_SET:
 		if (offset < 0 || offset > f->len)
 			return EOF;
-		rc = fseek(f->pkg->priv->f, f->base + offset, SEEK_SET);
+		rc = fops->seek(f->pkg->priv->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 = fseek(f->pkg->priv->f, f->base + offset, SEEK_SET);
+		rc = fops->seek(f->pkg->priv->f, f->base + offset, SEEK_SET);
 		break;
 	}
 
@@ -567,6 +634,7 @@ int upkg_export_seek(struct upkg_file *f, long offset, int whence)
 
 size_t upkg_export_read(struct upkg_file *f, void *buf, size_t n)
 {
+	const struct upkg_file_ops *fops = f->pkg->priv->fops;
 	size_t want = MIN(n, f->len - f->offset);
 	size_t rc;
 
@@ -575,14 +643,14 @@ size_t upkg_export_read(struct upkg_file *f, void *buf, size_t n)
 	}
 
 	if (f != f->pkg->priv->last_file) {
-		if (fseek(f->pkg->priv->f, f->base + f->offset, SEEK_SET))
+		if (fops->seek(f->pkg->priv->f, f->base + f->offset, SEEK_SET))
 			return 0;
 	}
 
-	rc = fread(buf, 1, want, f->pkg->priv->f);
+	rc = fops->read(buf, want, f->pkg->priv->f);
 	f->offset += rc;
 
-	if (want < n || (rc < want && feof(f->pkg->priv->f)))
+	if (want < n || (rc < want && fops->eof(f->pkg->priv->f)))
 		f->eof = 1;
 	return rc;
 }