liblbx: Parameterise I/O functions to allow custom streams.

[liblbx.git] / src / lbxtool.c

diff --git a/src/lbxtool.c b/src/lbxtool.c
index 47ee37b47a44cddcf265597313ec651a34c07217..d070e8f188feb04e0fd26b9bdc9a32c268aef569 100644 (file)
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -26,6 +26,7 @@
 #include "tools.h"
 #include "lbx.h"
 
+
 static void printusage(void)
 {
        puts("usage: lbxtool [-l|-x] [-v] [-f path] [file ...]");
@@ -67,17 +68,10 @@ int filematch(char **argv, const char *name)
        return i ? -1: 0;
 }
 
-int list(FILE *f, const char *name, int verbose, char **argv) {
-       LBX *lbx;
+int list(LBX *lbx, const char *name, int verbose, char **argv) {
        size_t nfiles;
        unsigned int i;
 
-       lbx = lbx_fopen(f, name);
-       if (!lbx) {
-               errmsg("failed to open archive: %s.\n", lbx_strerror());
-               return EXIT_FAILURE;
-       }
-
        nfiles = lbx_numfiles(lbx);
        if (verbose) {
                printf("Files in archive: %zu\n", nfiles);
@@ -91,7 +85,7 @@ int list(FILE *f, const char *name, int verbose, char **argv) {
                switch (filematch(argv, stat.name)) {
                case -1: continue;
                case  0: break;
-               default: goto err;
+               default: return EXIT_FAILURE;
                }
 
                printf("%s", stat.name);
@@ -102,24 +96,13 @@ int list(FILE *f, const char *name, int verbose, char **argv) {
                putchar('\n');
        }
 
-       lbx_close(lbx);
        return EXIT_SUCCESS;
-err:
-       lbx_close(lbx);
-       return EXIT_FAILURE;
 }
 
-int extract(FILE *f, const char *name, int verbose, char **argv) {
-       LBX *lbx;
+int extract(LBX *lbx, const char *name, int verbose, char **argv) {
        size_t nfiles;
        unsigned int i;
 
-       lbx = lbx_fopen(f, name);
-       if (!lbx) {
-               errmsg("failed to open archive: %s.\n", lbx_strerror());
-               return EXIT_FAILURE;
-       }
-
        nfiles = lbx_numfiles(lbx);
        if (verbose) {
                printf("Files in archive: %zu\n", nfiles);
@@ -136,14 +119,14 @@ int extract(FILE *f, const char *name, int verbose, char **argv) {
                switch (filematch(argv, stat.name)) {
                case -1: continue;
                case  0: break;
-               default: goto err;
+               default: return EXIT_FAILURE;
                }
 
                of = fopen(stat.name, "wbx");
                if (!of) {
                        errmsg("failed to create output file %s: %m.\n",
                                                             stat.name);
-                       goto err;
+                       return EXIT_FAILURE;
                }
 
                if (verbose) printf("extracting %s...\n", stat.name);
@@ -152,24 +135,20 @@ int extract(FILE *f, const char *name, int verbose, char **argv) {
                        if (rc == 0) remove(stat.name);
                        errmsg("error extracting %s: %s.\n",
                               stat.name, lbx_strerror());
-                       goto err;
+                       return EXIT_FAILURE;
                }
                if (verbose) printf("wrote %zu bytes.\n", rc);
        }
 
-       lbx_close(lbx);
        return EXIT_SUCCESS;
-err:
-       lbx_close(lbx);
-       return EXIT_FAILURE;
 }
 
 int main(int argc, char **argv)
 {
-       int mode = MODE_NONE, verbose = 0;
+       int mode = MODE_NONE, verbose = 0, opt, rc = EXIT_FAILURE;
+       struct lbx_pipe_state state = { .f = stdin };
        const char *name = "stdin";
-       FILE *f  = stdin;
-       int opt;
+       LBX *lbx;
 
        static const char         *sopts   = "lxf:i:vV";
        static const struct option lopts[] = {
@@ -204,8 +183,7 @@ int main(int argc, char **argv)
                        name = strrchr(optarg, '/');
                        name = name ? name+1 : optarg;
 
-                       f = fopen(optarg, "rb");
-                       if (!f) {
+                       if (!freopen(optarg, "rb", state.f)) {
                                errmsg("failed to open file %s: %m\n", optarg);
                                return EXIT_FAILURE;
                        }
@@ -230,13 +208,27 @@ int main(int argc, char **argv)
                }
        }
 
+       if (fseek(state.f, 0, SEEK_CUR) == 0)
+               lbx = lbx_open(state.f, &lbx_default_fops, NULL, name);
+       else
+               lbx = lbx_open(&state, &lbx_pipe_fops, NULL, name);
+
+       if (!lbx) {
+               errmsg("failed to open archive: %s.\n", lbx_strerror());
+               return EXIT_FAILURE;
+       }
+
        switch (mode) {
        case MODE_LIST:
-               return list(f, name, verbose, &argv[optind]);
+               rc = list(lbx, name, verbose, &argv[optind]);
+               break;
        case MODE_EXTRACT:
-               return extract(f, name, verbose, &argv[optind]);
+               rc = extract(lbx, name, verbose, &argv[optind]);
+               break;
+       default:
+               fprintf(stderr, "%s: you must specify a mode.\n", progname);
        }
 
-       fprintf(stderr, "%s: you must specify a mode.\n", progname);
-       return EXIT_FAILURE;
+       lbx_close(lbx);
+       return rc;
 }