X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/98d285b2abc68892fcf3f0a48a37cfccabd5038c..f8295b32a98df79caee16a25a1dcf3a7a678e409:/src/lbx.c

diff --git a/src/lbx.c b/src/lbx.c
index 44508ab..5dc14fd 100644
--- a/src/lbx.c
+++ b/src/lbx.c
@@ -1,7 +1,7 @@
 /*
  *  2ooM: The Master of Orion II Reverse Engineering Project
  *  Library for working with LBX archive files.
- *  Copyright (C) 2006-2008 Nick Bowler
+ *  Copyright (C) 2006-2010 Nick Bowler
  *
  *  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
@@ -26,9 +26,6 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <sys/stat.h>
-#include <sys/mman.h>
-
 #include "pack.h"
 #include "misc.h"
 #include "lbx.h"
@@ -39,7 +36,7 @@
 int lbx_errno = 0;
 
 struct lbx_state {
-	const char *name;
+	char *name;
 
 	const struct lbx_file_ops *fops;
 	int (*dtor)(void *handle);
@@ -82,23 +79,40 @@ static struct lbx_state *lbx_init(unsigned char hdr[static LBX_HDR_SIZE])
 	return lbx;
 }
 
+static char *str_dup(const char *s)
+{
+	char *buf;
+
+	buf = malloc(strlen(s)+1);
+	if (buf)
+		strcpy(buf, s);
+	return buf;
+}
+
 struct lbx_state *lbx_open(void *f, const struct lbx_file_ops *fops,
                            int (*destructor)(void *), const char *name)
 {
 	unsigned char hdr_buf[LBX_HDR_SIZE];
-	struct lbx_state *lbx;
+	struct lbx_state *lbx = NULL;
+	char *dupname = NULL;
+
+	dupname = str_dup(name);
+	if (!dupname) {
+		lbx_errno = -errno;
+		goto err;
+	}
 
 	if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
 		lbx_errno = -errno;
-		return NULL;
+		goto err;
 	}
 
 	lbx = lbx_init(hdr_buf);
 	if (!lbx)
-		return NULL;
+		goto err;
 
+	lbx->name = dupname;
 	lbx->dtor = destructor;
-	lbx->name = name;
 	lbx->fops = fops;
 	lbx->f    = f;
 
@@ -109,19 +123,66 @@ struct lbx_state *lbx_open(void *f, const struct lbx_file_ops *fops,
 			lbx_errno = -errno;
 			if (fops->eof(f))
 				lbx_errno = LBX_EEOF;
-			free(lbx);
-			return NULL;
+			goto err;
 		}
 
 		lbx->offsets[i] = unpack_32_le(buf);
 	}
 
 	return lbx;
+err:
+	free(dupname);
+	free(lbx);
+	return NULL;
+}
+
+static int file_close(void *f)
+{
+	return fclose((FILE *)f);
+}
+
+static int pipe_close(void *f)
+{
+	struct lbx_pipe_state *p = f;
+	int rc;
+
+	rc = fclose(p->f);
+	free(p);
+	return rc;
+}
+
+static char *last_component(const char *name)
+{
+	char *c;
+
+	/* TODO: Handle other path separators. */
+	c = strrchr(name, '/');
+	if (!c)
+		return (char *)name;
+	return c+1;
 }
 
-struct lbx_state *lbx_fopen(FILE *f, const char *name)
+struct lbx_state *lbx_fopen(const char *file)
 {
-	return lbx_open(f, &lbx_default_fops, NULL, name);
+	const char *name = last_component(file);
+	struct lbx_pipe_state *p;
+	FILE *f;
+
+	f = fopen(file, "rb");
+	if (!f)
+		return NULL;
+
+	if (fseek(f, 0, SEEK_CUR) == 0)
+		return lbx_open(f, &lbx_default_fops, file_close, name);
+
+	p = malloc(sizeof *p);
+	if (!p) {
+		fclose(f);
+		return NULL;
+	}
+
+	*p = (struct lbx_pipe_state) { .f = f };
+	return lbx_open(p, &lbx_pipe_fops, pipe_close, name);
 }
 
 size_t lbx_numfiles(struct lbx_state *lbx)
@@ -151,6 +212,7 @@ int lbx_close(struct lbx_state *lbx)
 
 	if (lbx && lbx->dtor)
 		rc = lbx->dtor(lbx->f);
+	free(lbx->name);
 	free(lbx);
 
 	return rc;
@@ -231,6 +293,8 @@ int lbx_file_seek(struct lbx_file_state *f, long offset, int whence)
 	f->lbx->last_file = NULL;
 	if (fops->seek(f->lbx->f, f->base + pos, SEEK_SET) != 0)
 		return -1;
+
+	f->offset = pos;
 	f->lbx->last_file = f;
 	f->eof = 0;