/*
* 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 © 2006-2011, 2013 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
#include "tools.h"
#include "lbx.h"
-
+#include "error.h"
static void printusage(void)
{
puts("For now, see the man page for detailed help.");
}
-static const char *progname;
-#define errmsg(fmt, ...) (\
- fprintf(stderr, "%s: " fmt, progname, __VA_ARGS__)\
-)
-
enum {
MODE_NONE,
MODE_LIST,
case FNM_NOMATCH:
break;
default:
- errmsg("error matching glob: %s.\n", argv[i]);
+ tool_err(-1, "error matching glob: %s", argv[i]);
return 1;
}
}
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_stat(lbx, i, &stat);
+ lbx_file_stat(lbx, i, &stat);
switch (filematch(argv, stat.name)) {
case -1: continue;
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;
}
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;
- lbx_stat(lbx, i, &stat);
+ lbx_file_stat(lbx, i, &stat);
switch (filematch(argv, stat.name)) {
case -1: continue;
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;
}
int mode = MODE_NONE, verbose = 0, opt, rc = EXIT_FAILURE;
struct lbx_pipe_state stdin_handle = { .f = stdin };
const char *file = NULL;
- LBX *lbx;
+ struct lbx *lbx;
static const char *sopts = "lxf:i:vV";
static const struct option lopts[] = {
{ 0 }
};
- progname = "lbxtool"; /* argv[0]; */
+ tool_init("lbxtool", argc, argv);
while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
switch(opt) {
case 'l':
verbose = 1;
break;
case 'V':
- puts(VERSION_BOILERPLATE("lbxtool"));
+ tool_version();
return EXIT_SUCCESS;
case 'U':
printusage();
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;
}
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);