liblbx: Rename lbx_stat to lbx_file_stat.

[liblbx.git] / src / lbx.c

diff --git a/src/lbx.c b/src/lbx.c
index 05da0b4775fb74a858846d068e9b228b52bbff87..0e26315fc8652acdc922a7f526140d5288463ab9 100644 (file)
--- 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
@@ -136,9 +136,53 @@ err:
        return NULL;
 }
 
-struct lbx_state *lbx_fopen(FILE *f, const char *name)
+static int file_close(void *f)
 {
-       return lbx_open(f, &lbx_default_fops, NULL, name);
+       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)
+{
+       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 +190,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) {
                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;
 }
 
@@ -249,6 +294,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;