X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/9dd570d53e4fa3e50d631f355c99823283f77f6f..548f5563f2abaf3f835038fe3a40d8d4f2a3b751:/src/lbxtool.c?ds=sidebyside
diff --git a/src/lbxtool.c b/src/lbxtool.c
index 687e419..c76bdd6 100644
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -1,12 +1,43 @@
-#define _GNU_SOURCE
+/*
+ * 2ooM: The Master of Orion II Reverse Engineering Project
+ * Simple command-line tool to extract LBX archive files.
+ * Copyright (C) 2006-2008 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 "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__)\
@@ -37,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);
@@ -61,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);
@@ -72,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);
@@ -106,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);
@@ -122,26 +135,22 @@ 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:v";
+ static const char *sopts = "lxf:i:vV";
static const struct option lopts[] = {
{ "list", 0, NULL, 'l' },
{ "extract", 0, NULL, 'x' },
@@ -151,6 +160,10 @@ int main(int argc, char **argv)
{ "verbose", 0, NULL, 'v' },
+ { "version", 0, NULL, 'V' },
+ { "usage", 0, NULL, 'U' },
+ { "help", 0, NULL, 'H' },
+
{ 0 }
};
@@ -170,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;
}
@@ -182,18 +194,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 (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;
}