liblbx: Move extraction outside of the library.

[liblbx.git] / src / lbxtool.c

diff --git a/src/lbxtool.c b/src/lbxtool.c
index e702587057082770eb3651add0684a689d330ab1..9f0097a7f87243a24012b98e995ddd4e6d3897cc 100644 (file)
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -16,11 +16,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _GNU_SOURCE
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <getopt.h>
 #include <fnmatch.h>
 
@@ -52,7 +52,7 @@ enum {
 
 int filematch(char **argv, const char *name)
 {
-       int rc, i;
+       int i;
 
        for (i = 0; argv[i]; i++) {
                switch(fnmatch(argv[i], name, 0)) {
@@ -100,6 +100,49 @@ int list(LBX *lbx, const char *name, int verbose, char **argv) {
        return EXIT_SUCCESS;
 }
 
+int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
+{
+       int ret = -1;
+       size_t rc;
+       FILE *of;
+
+       of = fopen(stat->name, "wb");
+       if (!of) {
+               errmsg("%s: fopen: %s\n",
+                       stat->name, strerror(errno));
+               return -1;
+       }
+
+       while (1) {
+               unsigned char buf[1024];
+
+               rc = lbx_file_read(f, buf, sizeof buf);
+               if (rc == 0) {
+                       if (lbx_file_eof(f))
+                               ret = 0;
+                       break;
+               }
+
+               if (fwrite(buf, rc, 1, of) != 1) {
+                       errmsg("%s: fwrite: %s\n", stat->name, strerror(errno));
+                       break;
+               }
+
+               if (rc < sizeof buf) {
+                       if (lbx_file_eof(f))
+                               ret = 0;
+                       break;
+               }
+       }
+
+       if (fclose(of) == EOF) {
+               errmsg("%s: fclose: %s\n", stat->name, strerror(errno));
+               return -1;
+       }
+
+       return ret;
+}
+
 int extract(LBX *lbx, const char *name, int verbose, char **argv) {
        size_t nfiles;
        unsigned int i;
@@ -111,9 +154,7 @@ int extract(LBX *lbx, const char *name, int verbose, char **argv) {
 
        for (i = 0; i < nfiles; i++) {
                struct lbx_statbuf stat;
-               size_t rc;
-               FILE *of;
-               int j;
+               LBXfile *file;
 
                lbx_stat(lbx, i, &stat);
 
@@ -123,22 +164,16 @@ int extract(LBX *lbx, const char *name, int verbose, char **argv) {
                default: return EXIT_FAILURE;
                }
 
-               of = fopen(stat.name, "wbx");
-               if (!of) {
-                       errmsg("failed to create output file %s: %m.\n",
-                                                            stat.name);
-                       return EXIT_FAILURE;
+               file = lbx_file_open(lbx, i);
+               if (!file) {
+                       errmsg("failed to open archive member %s: %s.\n",
+                               stat.name, lbx_strerror());
+                       continue;
                }
 
-               if (verbose) printf("extracting %s...\n", stat.name);
-               rc = lbx_extract(lbx, i, of);
-               if (rc < stat.size) {
-                       if (rc == 0) remove(stat.name);
-                       errmsg("error extracting %s: %s.\n",
-                              stat.name, lbx_strerror());
+               if (extract_file(file, &stat) == -1)
                        return EXIT_FAILURE;
-               }
-               if (verbose) printf("wrote %zu bytes.\n", rc);
+               lbx_file_close(file);
        }
 
        return EXIT_SUCCESS;
@@ -178,9 +213,6 @@ int main(int argc, char **argv)
                        mode = MODE_EXTRACT;
                        break;
                case 'f':
-                       if (strcmp(optarg, "-") == 0)
-                               break;
-
                        name = strrchr(optarg, '/');
                        name = name ? name+1 : optarg;