liblbx: Make lbx_fopen more useful.

[liblbx.git] / src / lbx.c

diff --git a/src/lbx.c b/src/lbx.c
index 05da0b4775fb74a858846d068e9b228b52bbff87..17bf9769f0a670d938b67ed516e0043574543a25 100644 (file)
--- a/src/lbx.c
+++ b/src/lbx.c
@@ -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)