X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/9d7bdff315a9fbe3ed27266df09fe9bc8de2b605..256cc05240e58eb10bb4ffd44e942ed28f00c27e:/src/lbx.c

diff --git a/src/lbx.c b/src/lbx.c
index 05da0b4..720cf07 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
@@ -16,10 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,13 +25,12 @@
 
 #include "pack.h"
 #include "misc.h"
+#include "error.h"
 #include "lbx.h"
 
 #define LBX_MAGIC    0x0000fead
 #define LBX_HDR_SIZE 8
 
-int lbx_errno = 0;
-
 struct lbx_state {
 	char *name;
 
@@ -62,13 +58,13 @@ static struct lbx_state *lbx_init(unsigned char hdr[static LBX_HDR_SIZE])
 	struct lbx_state *lbx;
 
 	if (magic != LBX_MAGIC) {
-		lbx_errno = -LBX_EMAGIC;
+		lbx_error_raise(LBX_EMAGIC);
 		return NULL;
 	}
 
 	lbx = malloc(sizeof *lbx + sizeof lbx->offsets[0] * (nfiles+1));
 	if (!lbx) {
-		lbx_errno = -errno;
+		lbx_error_raise(LBX_ENOMEM);
 		return NULL;
 	}
 
@@ -98,12 +94,13 @@ struct lbx_state *lbx_open(void *f, const struct lbx_file_ops *fops,
 
 	dupname = str_dup(name);
 	if (!dupname) {
-		lbx_errno = -errno;
+		lbx_error_raise(LBX_ENOMEM);
 		goto err;
 	}
 
 	if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
-		lbx_errno = -errno;
+		if (fops->eof(f))
+			lbx_error_raise(LBX_EEOF);
 		goto err;
 	}
 
@@ -120,9 +117,8 @@ struct lbx_state *lbx_open(void *f, const struct lbx_file_ops *fops,
 		unsigned char buf[4];
 
 		if (fops->read(buf, sizeof buf, f) != sizeof buf) {
-			lbx_errno = -errno;
 			if (fops->eof(f))
-				lbx_errno = LBX_EEOF;
+				lbx_error_raise(LBX_EEOF);
 			goto err;
 		}
 
@@ -136,9 +132,53 @@ err:
 	return NULL;
 }
 
-struct lbx_state *lbx_fopen(FILE *f, const char *name)
+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(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)
@@ -146,19 +186,20 @@ size_t lbx_numfiles(struct lbx_state *lbx)
 	return lbx->nfiles;
 }
 
-int lbx_stat(struct lbx_state *lbx, size_t index, struct lbx_statbuf *buf)
+int
+lbx_file_stat(struct lbx_state *lbx, unsigned fileno, struct lbx_statbuf *buf)
 {
 	static char str[256]; /* FIXME */
 
-	if (index >= lbx->nfiles) {
+	if (fileno >= lbx->nfiles) {
+		lbx_error_raise(LBX_ENOENT);
 		buf->name = NULL;
-		lbx_errno = LBX_ERANGE;
 		return -1;
 	}
 
-	snprintf(str, sizeof str, "%s.%03zu", lbx->name, index);
+	snprintf(str, sizeof str, "%s.%03u", lbx->name, fileno);
 	buf->name = str;
-	buf->size = lbx->offsets[index+1] - lbx->offsets[index];
+	buf->size = lbx->offsets[fileno+1] - lbx->offsets[fileno];
 	return 0;
 }
 
@@ -179,19 +220,18 @@ struct lbx_file_state *lbx_file_open(struct lbx_state *lbx, unsigned fileno)
 	struct lbx_file_state *state;
 
 	if (fileno >= lbx->nfiles) {
-		lbx_errno = LBX_ERANGE;
+		lbx_error_raise(LBX_ENOENT);
 		return NULL;
 	}
 
 	lbx->last_file = NULL;
 	if (lbx->fops->seek(lbx->f, lbx->offsets[fileno], SEEK_SET) != 0) {
-		lbx_errno = -errno;
 		return NULL;
 	}
 
 	state = malloc(sizeof *state);
 	if (!state) {
-		lbx_errno = -errno;
+		lbx_error_raise(LBX_ENOMEM);
 		return NULL;
 	}
 
@@ -249,6 +289,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;
 
@@ -271,19 +313,3 @@ void lbx_file_close(struct lbx_file_state *f)
 		f->lbx->last_file = NULL;
 	free(f);
 }
-
-const char *lbx_strerror(void)
-{
-	if (lbx_errno < 0)
-		return strerror(-lbx_errno);
-
-	switch (lbx_errno) {
-	case LBX_ESUCCESS: return "Success";
-	case LBX_EMAGIC:   return "Bad magic number";
-	case LBX_EEOF:     return "Unexpected end-of-file";
-	case LBX_ERANGE:   return "Index out of range";
-	case LBX_EFORMAT:  return "Invalid file format";
-	}
-
-	return "Unknown error";
-}