X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/97ae1755d995159117c16a9410f696b936d3d4f0..c02dcc9610e66ebe6154e60dcd2f109c90eb09df:/src/lbxtool.c
diff --git a/src/lbxtool.c b/src/lbxtool.c
index a220cea..f393eaa 100644
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -1,11 +1,44 @@
-#define _GNU_SOURCE
+/*
+ * 2ooM: The Master of Orion II Reverse Engineering Project
+ * Simple command-line tool to extract LBX archive files.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#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 ...]");
+}
+
+static void printhelp(void)
+{
+ printusage();
+ puts("For now, see the man page for detailed help.");
+}
+
static const char *progname;
#define errmsg(fmt, ...) (\
fprintf(stderr, "%s: " fmt, progname, __VA_ARGS__)\
@@ -17,17 +50,29 @@ enum {
MODE_EXTRACT,
};
-int list(FILE *f, const char *name, int verbose) {
- LBX *lbx;
- size_t nfiles;
- unsigned int i;
+int filematch(char **argv, const char *name)
+{
+ int i;
- lbx = lbx_fopen(f, name);
- if (!lbx) {
- errmsg("failed to open archive: %s.\n", lbx_strerror());
- return EXIT_FAILURE;
+ for (i = 0; argv[i]; i++) {
+ switch(fnmatch(argv[i], name, 0)) {
+ case 0:
+ return 0;
+ case FNM_NOMATCH:
+ break;
+ default:
+ errmsg("error matching glob: %s.\n", argv[i]);
+ return 1;
+ }
}
+ return i ? -1: 0;
+}
+
+int list(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);
@@ -36,7 +81,14 @@ int list(FILE *f, const char *name, int verbose) {
for (i = 0; i < nfiles; i++) {
struct lbx_statbuf stat;
- lbx_stat(lbx, i, &stat);
+ lbx_file_stat(lbx, i, &stat);
+
+ switch (filematch(argv, stat.name)) {
+ case -1: continue;
+ case 0: break;
+ default: return EXIT_FAILURE;
+ }
+
printf("%s", stat.name);
if (verbose) {
printf(" size=%zu bytes", stat.size);
@@ -45,21 +97,56 @@ int list(FILE *f, const char *name, int verbose) {
putchar('\n');
}
- lbx_close(lbx);
return EXIT_SUCCESS;
}
-int extract(FILE *f, const char *name, int verbose) {
- 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;
- lbx = lbx_fopen(f, name);
- if (!lbx) {
- errmsg("failed to open archive: %s.\n", lbx_strerror());
- return EXIT_FAILURE;
+ 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, int verbose, char **argv) {
+ size_t nfiles;
+ unsigned int i;
+
nfiles = lbx_numfiles(lbx);
if (verbose) {
printf("Files in archive: %zu\n", nfiles);
@@ -67,39 +154,39 @@ int extract(FILE *f, const char *name, int verbose) {
for (i = 0; i < nfiles; i++) {
struct lbx_statbuf stat;
- size_t rc;
- FILE *of;
-
- lbx_stat(lbx, i, &stat);
- of = fopen(stat.name, "wbx");
- if (!of) {
- errmsg("failed to create output file %s: %m.\n",
- stat.name);
- break;
+ LBXfile *file;
+
+ lbx_file_stat(lbx, i, &stat);
+
+ switch (filematch(argv, stat.name)) {
+ case -1: continue;
+ case 0: break;
+ default: return EXIT_FAILURE;
}
- if (verbose) printf("extracting %s...\n", stat.name);
- rc = lbx_extract(lbx, i, of);
- if (rc < stat.size) {
- errmsg("error extracting %s: %s.\n",
- stat.name, lbx_strerror());
- break;
+ 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("wrote %zu bytes.\n", rc);
+
+ if (extract_file(file, &stat) == -1)
+ return EXIT_FAILURE;
+ lbx_file_close(file);
}
- lbx_close(lbx);
return EXIT_SUCCESS;
}
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:v";
+ static const char *sopts = "lxf:i:vV";
static const struct option lopts[] = {
{ "list", 0, NULL, 'l' },
{ "extract", 0, NULL, 'x' },
@@ -109,6 +196,10 @@ int main(int argc, char **argv)
{ "verbose", 0, NULL, 'v' },
+ { "version", 0, NULL, 'V' },
+ { "usage", 0, NULL, 'U' },
+ { "help", 0, NULL, 'H' },
+
{ 0 }
};
@@ -122,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. */
@@ -140,18 +221,41 @@ int main(int argc, char **argv)
case 'v':
verbose = 1;
break;
+ case 'V':
+ puts(VERSION_BOILERPLATE("lbxtool"));
+ return EXIT_SUCCESS;
+ case 'U':
+ printusage();
+ return EXIT_SUCCESS;
+ case 'H':
+ printhelp();
+ return EXIT_SUCCESS;
default:
return EXIT_FAILURE;
}
}
+ 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);
+ rc = list(lbx, verbose, &argv[optind]);
+ break;
case MODE_EXTRACT:
- return extract(f, name, verbose);
+ 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;
}