X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/c02dcc9610e66ebe6154e60dcd2f109c90eb09df..31b96a5d3d06122cbca0d38d32e0bbfa87cb58c7:/src/lbxtool.c
diff --git a/src/lbxtool.c b/src/lbxtool.c
index f393eaa..6629969 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-2010 Nick Bowler
+ * Copyright © 2006-2011, 2013-2014, 2021 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,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+
#include
#include
#include
@@ -24,25 +25,52 @@
#include
#include
+#include "help.h"
+
#include "tools.h"
#include "lbx.h"
+#include "error.h"
+#include "toolopts.h"
+static const char sopts[] = SOPT_STRING;
+static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
-static void printusage(void)
+static void print_usage(FILE *f)
{
- puts("usage: lbxtool [-l|-x] [-v] [-f path] [file ...]");
+ const char *progname = tool_invocation();
+
+ fprintf(f, "Usage: %s [options] [-l|-x] [file ...]\n", progname);
+ if (f != stdout)
+ fprintf(f, "Try %s --help for more information.\n", progname);
}
-static void printhelp(void)
+static void print_help(void)
{
- printusage();
- puts("For now, see the man page for detailed help.");
-}
+ const struct option *opt;
+
+ print_usage(stdout);
+
+ puts("This is \"lbxtool\": a command-line tool for manipulating the LBX archives\n"
+ "used in Moo2.");
+
+ putchar('\n');
+ puts("Options:");
+ for (opt = lopts; opt->name; opt++) {
+ struct lopt_help help;
+ int w;
-static const char *progname;
-#define errmsg(fmt, ...) (\
- fprintf(stderr, "%s: " fmt, progname, __VA_ARGS__)\
-)
+ if (!lopt_get_help(opt, &help))
+ continue;
+
+ help_print_option(opt, help.arg, help.desc, 20);
+ }
+ putchar('\n');
+
+ puts("For more information, see the lbxtool(1) man page.");
+ putchar('\n');
+
+ printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+}
enum {
MODE_NONE,
@@ -61,7 +89,7 @@ int filematch(char **argv, const char *name)
case FNM_NOMATCH:
break;
default:
- errmsg("error matching glob: %s.\n", argv[i]);
+ tool_err(-1, "error matching glob: %s", argv[i]);
return 1;
}
}
@@ -69,16 +97,15 @@ int filematch(char **argv, const char *name)
return i ? -1: 0;
}
-int list(LBX *lbx, int verbose, char **argv) {
- size_t nfiles;
+int list(struct lbx *lbx, int verbose, char **argv)
+{
unsigned int i;
- nfiles = lbx_numfiles(lbx);
if (verbose) {
- printf("Files in archive: %zu\n", nfiles);
+ printf("Files in archive: %u\n", lbx->nfiles);
}
- for (i = 0; i < nfiles; i++) {
+ for (i = 0; i < lbx->nfiles; i++) {
struct lbx_statbuf stat;
lbx_file_stat(lbx, i, &stat);
@@ -108,8 +135,7 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
of = fopen(stat->name, "wb");
if (!of) {
- errmsg("%s: fopen: %s\n",
- stat->name, strerror(errno));
+ tool_err(0, "%s: fopen", stat->name);
return -1;
}
@@ -117,42 +143,41 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
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 > 0) {
+ /* Write out any data we got. */
+ if (fwrite(buf, rc, 1, of) != 1) {
+ tool_err(0, "%s: fwrite", stat->name);
+ break;
+ }
}
+ /* Now test for read errors */
if (rc < sizeof buf) {
- if (lbx_file_eof(f))
+ if (!lbx_file_eof(f))
+ tool_err(-1, "error reading archive: %s", lbx_errmsg());
+ else
ret = 0;
break;
}
}
if (fclose(of) == EOF) {
- errmsg("%s: fclose: %s\n", stat->name, strerror(errno));
+ tool_err(0, "%s: fclose", stat->name);
return -1;
}
return ret;
}
-int extract(LBX *lbx, int verbose, char **argv) {
- size_t nfiles;
+int extract(struct lbx *lbx, int verbose, char **argv)
+{
unsigned int i;
- nfiles = lbx_numfiles(lbx);
if (verbose) {
- printf("Files in archive: %zu\n", nfiles);
+ printf("Files in archive: %u\n", lbx->nfiles);
}
- for (i = 0; i < nfiles; i++) {
+ for (i = 0; i < lbx->nfiles; i++) {
struct lbx_statbuf stat;
LBXfile *file;
@@ -166,8 +191,7 @@ int extract(LBX *lbx, int verbose, char **argv) {
file = lbx_file_open(lbx, i);
if (!file) {
- errmsg("failed to open archive member %s: %s.\n",
- stat.name, lbx_strerror());
+ tool_err(-1, "%s: %s", stat.name, lbx_errmsg());
continue;
}
@@ -184,26 +208,9 @@ int main(int argc, char **argv)
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[] = {
- { "list", 0, NULL, 'l' },
- { "extract", 0, NULL, 'x' },
+ struct lbx *lbx;
- { "file", 1, NULL, 'f' },
- { "index", 1, NULL, 'i' },
-
- { "verbose", 0, NULL, 'v' },
-
- { "version", 0, NULL, 'V' },
- { "usage", 0, NULL, 'U' },
- { "help", 0, NULL, 'H' },
-
- { 0 }
- };
-
- progname = "lbxtool"; /* argv[0]; */
+ tool_init("lbxtool", argc, argv);
while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
switch(opt) {
case 'l':
@@ -215,20 +222,14 @@ int main(int argc, char **argv)
case 'f':
file = optarg;
break;
- case 'i':
- /* FIXME: Add index file support. */
- break;
case 'v':
verbose = 1;
break;
case 'V':
- puts(VERSION_BOILERPLATE("lbxtool"));
- return EXIT_SUCCESS;
- case 'U':
- printusage();
+ tool_version();
return EXIT_SUCCESS;
case 'H':
- printhelp();
+ print_help();
return EXIT_SUCCESS;
default:
return EXIT_FAILURE;
@@ -241,7 +242,7 @@ int main(int argc, char **argv)
lbx = lbx_open(&stdin_handle, &lbx_pipe_fops, NULL, "stdin");
if (!lbx) {
- errmsg("failed to open archive: %s.\n", lbx_strerror());
+ tool_err(-1, "%s: %s", file ? file : "stdin", lbx_errmsg());
return EXIT_FAILURE;
}
@@ -253,7 +254,7 @@ int main(int argc, char **argv)
rc = extract(lbx, verbose, &argv[optind]);
break;
default:
- fprintf(stderr, "%s: you must specify a mode.\n", progname);
+ tool_err(-1, "no mode specified");
}
lbx_close(lbx);