liblbx: Make lbx_fopen more useful.

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)

diff --git a/src/lbx.h b/src/lbx.h
index 329bf09feb289d5c77653fcf8cbc6415a06bfb6e..72532aa96940bdf8b6081b76cb365f5fff85825b 100644 (file)
--- a/src/lbx.h
+++ b/src/lbx.h
@@ -43,7 +43,7 @@ struct lbx_statbuf {
 /* Archive operations */
 LBX   *lbx_open(void *handle, const struct lbx_file_ops *fops,
                 int (*destructor)(void *handle), const char *name);
-LBX   *lbx_fopen(FILE *, const char *);
+LBX   *lbx_fopen(const char *);
 LBX   *lbx_mopen(void *, size_t, const char *);
 int    lbx_close(LBX *);
 size_t lbx_numfiles(LBX *);

diff --git a/src/lbxtool.c b/src/lbxtool.c
index d0f764d086aced2321c4c5b3bc8acde6ecbfd7f4..8c34e7ccc03a1157a3e55aba8d9daff54bea399f 100644 (file)
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -182,8 +182,8 @@ int extract(LBX *lbx, int verbose, char **argv) {
 int main(int argc, char **argv)
 {
        int mode = MODE_NONE, verbose = 0, opt, rc = EXIT_FAILURE;
-       struct lbx_pipe_state state = { .f = stdin };
-       const char *name = "stdin";
+       struct lbx_pipe_state stdin_handle = { .f = stdin };
+       const char *file = NULL;
        LBX *lbx;
 
        static const char         *sopts   = "lxf:i:vV";
@@ -213,13 +213,7 @@ int main(int argc, char **argv)
                        mode = MODE_EXTRACT;
                        break;
                case 'f':
-                       name = strrchr(optarg, '/');
-                       name = name ? name+1 : optarg;
-
-                       if (!freopen(optarg, "rb", state.f)) {
-                               errmsg("failed to open file %s: %m\n", optarg);
-                               return EXIT_FAILURE;
-                       }
+                       file = optarg;
                        break;
                case 'i':
                        /* FIXME: Add index file support. */
@@ -241,10 +235,10 @@ int main(int argc, char **argv)
                }
        }
 
-       if (fseek(state.f, 0, SEEK_CUR) == 0)
-               lbx = lbx_open(state.f, &lbx_default_fops, NULL, name);
+       if (file)
+               lbx = lbx_fopen(file);
        else
-               lbx = lbx_open(&state, &lbx_pipe_fops, NULL, name);
+               lbx = lbx_open(&stdin_handle, &lbx_pipe_fops, NULL, "stdin");
 
        if (!lbx) {
                errmsg("failed to open archive: %s.\n", lbx_strerror());