X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/ebf92322de06b5ece1724279d7f756077caa1438..f8295b32a98df79caee16a25a1dcf3a7a678e409:/src/lbxtool.c
diff --git a/src/lbxtool.c b/src/lbxtool.c
index 47ee37b..754592f 100644
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -1,7 +1,7 @@
/*
* 2ooM: The Master of Orion II Reverse Engineering Project
* Simple command-line tool to extract LBX archive files.
- * Copyright (C) 2006-2008 Nick Bowler
+ * Copyright (C) 2006-2010 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,16 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#define _GNU_SOURCE
+#include
#include
#include
#include
+#include
#include
#include
#include "tools.h"
#include "lbx.h"
+
static void printusage(void)
{
puts("usage: lbxtool [-l|-x] [-v] [-f path] [file ...]");
@@ -50,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)) {
@@ -67,17 +69,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, 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 +86,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 +97,56 @@ 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;
- size_t nfiles;
- unsigned int i;
+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;
+ }
- lbx = lbx_fopen(f, name);
- if (!lbx) {
- errmsg("failed to open archive: %s.\n", lbx_strerror());
- return EXIT_FAILURE;
+ 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, int verbose, char **argv) {
+ size_t nfiles;
+ unsigned int i;
+
nfiles = lbx_numfiles(lbx);
if (verbose) {
printf("Files in archive: %zu\n", nfiles);
@@ -127,49 +154,37 @@ int extract(FILE *f, 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);
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;
+ 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());
- goto err;
- }
- if (verbose) printf("wrote %zu bytes.\n", rc);
+ if (extract_file(file, &stat) == -1)
+ return EXIT_FAILURE;
+ lbx_file_close(file);
}
- 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;
- const char *name = "stdin";
- FILE *f = stdin;
- int opt;
+ int mode = MODE_NONE, verbose = 0, opt, rc = EXIT_FAILURE;
+ struct lbx_pipe_state stdin_handle = { .f = stdin };
+ const char *file = NULL;
+ LBX *lbx;
static const char *sopts = "lxf:i:vV";
static const struct option lopts[] = {
@@ -198,17 +213,7 @@ 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;
-
- f = fopen(optarg, "rb");
- if (!f) {
- errmsg("failed to open file %s: %m\n", optarg);
- return EXIT_FAILURE;
- }
+ file = optarg;
break;
case 'i':
/* FIXME: Add index file support. */
@@ -230,13 +235,27 @@ int main(int argc, char **argv)
}
}
+ if (file)
+ lbx = lbx_fopen(file);
+ else
+ lbx = lbx_open(&stdin_handle, &lbx_pipe_fops, NULL, "stdin");
+
+ 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, verbose, &argv[optind]);
+ break;
case MODE_EXTRACT:
- return extract(f, name, verbose, &argv[optind]);
+ rc = extract(lbx, 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;
}