X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/256cc05240e58eb10bb4ffd44e942ed28f00c27e..2ec44cef64979d8e19eb66206c26a7bcad4bef8a:/src/lbx.c

diff --git a/src/lbx.c b/src/lbx.c
index 720cf07..30cd156 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-2010 Nick Bowler
+ *  Copyright © 2006-2010, 2013-2014 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
@@ -31,7 +31,9 @@
 #define LBX_MAGIC    0x0000fead
 #define LBX_HDR_SIZE 8
 
-struct lbx_state {
+struct lbx_priv {
+	struct lbx pub;
+
 	char *name;
 
 	const struct lbx_file_ops *fops;
@@ -40,22 +42,21 @@ struct lbx_state {
 
 	struct lbx_file_state *last_file;
 
-	unsigned short nfiles;
 	unsigned long offsets[];
 };
 
 struct lbx_file_state {
 	unsigned long base, limit, offset;
-	struct lbx_state *lbx;
+	struct lbx_priv *lbx;
 	int eof;
 };
 
-static struct lbx_state *lbx_init(unsigned char hdr[static LBX_HDR_SIZE])
+static struct lbx_priv *lbx_init(unsigned char hdr[static LBX_HDR_SIZE])
 {
 	unsigned short nfiles  = unpack_16_le(hdr+0);
 	unsigned long  magic   = unpack_32_le(hdr+2);
 	unsigned short version = unpack_16_le(hdr+6);
-	struct lbx_state *lbx;
+	struct lbx_priv *lbx;
 
 	if (magic != LBX_MAGIC) {
 		lbx_error_raise(LBX_EMAGIC);
@@ -68,8 +69,8 @@ static struct lbx_state *lbx_init(unsigned char hdr[static LBX_HDR_SIZE])
 		return NULL;
 	}
 
-	*lbx = (struct lbx_state) {
-		.nfiles = nfiles,
+	*lbx = (struct lbx_priv) {
+		.pub = { .nfiles = nfiles, },
 	};
 
 	return lbx;
@@ -85,11 +86,11 @@ static char *str_dup(const char *s)
 	return buf;
 }
 
-struct lbx_state *lbx_open(void *f, const struct lbx_file_ops *fops,
-                           int (*destructor)(void *), const char *name)
+struct lbx *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 = NULL;
+	struct lbx_priv *lbx = NULL;
 	char *dupname = NULL;
 
 	dupname = str_dup(name);
@@ -113,7 +114,7 @@ struct lbx_state *lbx_open(void *f, const struct lbx_file_ops *fops,
 	lbx->fops = fops;
 	lbx->f    = f;
 
-	for (unsigned i = 0; i <= lbx->nfiles; i++) {
+	for (unsigned i = 0; i <= lbx->pub.nfiles; i++) {
 		unsigned char buf[4];
 
 		if (fops->read(buf, sizeof buf, f) != sizeof buf) {
@@ -125,7 +126,7 @@ struct lbx_state *lbx_open(void *f, const struct lbx_file_ops *fops,
 		lbx->offsets[i] = unpack_32_le(buf);
 	}
 
-	return lbx;
+	return &lbx->pub;
 err:
 	free(dupname);
 	free(lbx);
@@ -158,21 +159,24 @@ static char *last_component(const char *name)
 	return c+1;
 }
 
-struct lbx_state *lbx_fopen(const char *file)
+struct lbx *lbx_fopen(const char *file)
 {
 	const char *name = last_component(file);
 	struct lbx_pipe_state *p;
 	FILE *f;
 
 	f = fopen(file, "rb");
-	if (!f)
+	if (!f) {
+		lbx_error_raise(-errno);
 		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) {
+		lbx_error_raise(LBX_ENOMEM);
 		fclose(f);
 		return NULL;
 	}
@@ -181,18 +185,13 @@ struct lbx_state *lbx_fopen(const char *file)
 	return lbx_open(p, &lbx_pipe_fops, pipe_close, name);
 }
 
-size_t lbx_numfiles(struct lbx_state *lbx)
-{
-	return lbx->nfiles;
-}
-
-int
-lbx_file_stat(struct lbx_state *lbx, unsigned fileno, struct lbx_statbuf *buf)
+int lbx_file_stat(struct lbx *pub, unsigned fileno, struct lbx_statbuf *buf)
 {
+	struct lbx_priv *lbx = (struct lbx_priv *)pub;
 	static char str[256]; /* FIXME */
 
-	if (fileno >= lbx->nfiles) {
-		lbx_error_raise(LBX_ENOENT);
+	if (fileno >= lbx->pub.nfiles) {
+		lbx_error_raise(LBX_EINVAL);
 		buf->name = NULL;
 		return -1;
 	}
@@ -203,8 +202,9 @@ lbx_file_stat(struct lbx_state *lbx, unsigned fileno, struct lbx_statbuf *buf)
 	return 0;
 }
 
-int lbx_close(struct lbx_state *lbx)
+int lbx_close(struct lbx *pub)
 {
+	struct lbx_priv *lbx = (struct lbx_priv *)pub;
 	int rc = 0;
 
 	if (lbx && lbx->dtor)
@@ -215,12 +215,13 @@ int lbx_close(struct lbx_state *lbx)
 	return rc;
 }
 
-struct lbx_file_state *lbx_file_open(struct lbx_state *lbx, unsigned fileno)
+struct lbx_file_state *lbx_file_open(struct lbx *pub, unsigned fileno)
 {
+	struct lbx_priv *lbx = (struct lbx_priv *)pub;
 	struct lbx_file_state *state;
 
-	if (fileno >= lbx->nfiles) {
-		lbx_error_raise(LBX_ENOENT);
+	if (fileno >= lbx->pub.nfiles) {
+		lbx_error_raise(LBX_EINVAL);
 		return NULL;
 	}