liblbx: Make lbx_fopen more useful.

[liblbx.git] / src / lbxtool.c

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());