From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 10 Feb 2010 04:24:56 +0000 (-0500)
Subject: liblbx: Update lbximg_fopen to work like lbx_fopen.
X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/commitdiff_plain/fc8dd8be3744680d93c490227be4db8628377d3c

liblbx: Update lbximg_fopen to work like lbx_fopen.
---

diff --git a/src/image.c b/src/image.c
index 5f3a6e3..78cb8a5 100644
--- a/src/image.c
+++ b/src/image.c
@@ -159,9 +159,41 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
 	return img;
 }
 
-struct lbx_image *lbximg_fopen(FILE *f)
+static int pipe_close(void *f)
 {
-	return lbximg_open(f, &lbx_default_fops, NULL);
+	struct lbx_pipe_state *p = f;
+	int rc;
+
+	rc = fclose(p->f);
+	free(p);
+	return rc;
+}
+
+static int file_close(void *f)
+{
+	return fclose((FILE *)f);
+}
+
+struct lbx_image *lbximg_fopen(const char *file)
+{
+	struct lbx_pipe_state *p;
+	FILE *f;
+
+	f = fopen(file, "rb");
+	if (!f)
+		return NULL;
+
+	if (fseek(f, 0, SEEK_CUR) == 0)
+		return lbximg_open(f, &lbx_default_fops, file_close);
+
+	p = malloc(sizeof *p);
+	if (!p) {
+		fclose(f);
+		return NULL;
+	}
+
+	*p = (struct lbx_pipe_state) { .f = f };
+	return lbximg_open(p, &lbx_pipe_fops, pipe_close);
 }
 
 static int _lbx_drawrow(int first, struct lbx_image *img)
diff --git a/src/image.h b/src/image.h
index 9bd41eb..c1ca3ba 100644
--- a/src/image.h
+++ b/src/image.h
@@ -21,7 +21,7 @@ struct lbx_imginfo {
 
 LBX_IMG *lbximg_open(void *f, const struct lbx_file_ops *fops,
                      int (*destructor)(void *));
-LBX_IMG *lbximg_fopen(FILE *f);
+LBX_IMG *lbximg_fopen(const char *file);
 int      lbximg_close(LBX_IMG *img);
 
 unsigned char **lbximg_getframe(LBX_IMG *img, int frame);
diff --git a/src/lbximg.c b/src/lbximg.c
index a2b7405..1173538 100644
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -234,7 +234,7 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-	LBX_IMG *overimg = lbximg_fopen(f);
+	LBX_IMG *overimg = lbximg_open(f, &lbx_default_fops, NULL);
 	struct lbx_imginfo info;
 
 	if (!overimg) {