X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/f228da9594290408ee03ffddbd01eadefbf06f1d..59d43aadba53b164dc529cfef069c5aeb9a65807:/src/lbxtool.c
diff --git a/src/lbxtool.c b/src/lbxtool.c
index e702587..3c4e436 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 © 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
@@ -16,17 +16,17 @@
* 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"
-
+#include "error.h"
static void printusage(void)
{
@@ -39,11 +39,6 @@ static void printhelp(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,
@@ -52,7 +47,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)) {
@@ -61,7 +56,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,19 +64,18 @@ int filematch(char **argv, const char *name)
return i ? -1: 0;
}
-int list(LBX *lbx, const char *name, 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;
@@ -100,22 +94,61 @@ int list(LBX *lbx, const char *name, int verbose, char **argv) {
return EXIT_SUCCESS;
}
-int extract(LBX *lbx, const char *name, int verbose, char **argv) {
- size_t nfiles;
+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) {
+ tool_err(0, "%s: fopen", stat->name);
+ return -1;
+ }
+
+ while (1) {
+ unsigned char buf[1024];
+
+ rc = lbx_file_read(f, buf, sizeof buf);
+ 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))
+ tool_err(-1, "error reading archive: %s", lbx_errmsg());
+ else
+ ret = 0;
+ break;
+ }
+ }
+
+ if (fclose(of) == EOF) {
+ tool_err(0, "%s: fclose", stat->name);
+ return -1;
+ }
+
+ return ret;
+}
+
+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;
- size_t rc;
- FILE *of;
- int j;
+ LBXfile *file;
- lbx_stat(lbx, i, &stat);
+ lbx_file_stat(lbx, i, &stat);
switch (filematch(argv, stat.name)) {
case -1: continue;
@@ -123,22 +156,15 @@ int extract(LBX *lbx, const char *name, int verbose, char **argv) {
default: return EXIT_FAILURE;
}
- of = fopen(stat.name, "wbx");
- if (!of) {
- errmsg("failed to create output file %s: %m.\n",
- stat.name);
- return EXIT_FAILURE;
+ file = lbx_file_open(lbx, i);
+ if (!file) {
+ tool_err(-1, "%s: %s", stat.name, lbx_errmsg());
+ 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());
+ if (extract_file(file, &stat) == -1)
return EXIT_FAILURE;
- }
- if (verbose) printf("wrote %zu bytes.\n", rc);
+ lbx_file_close(file);
}
return EXIT_SUCCESS;
@@ -147,9 +173,9 @@ int extract(LBX *lbx, const char *name, int verbose, char **argv) {
int main(int argc, char **argv)
{
int mode = MODE_NONE, verbose = 0, opt, rc = EXIT_FAILURE;
- struct lbx_pipe_state state = { .f = stdin };
- const char *name = "stdin";
- LBX *lbx;
+ struct lbx_pipe_state stdin_handle = { .f = stdin };
+ const char *file = NULL;
+ struct lbx *lbx;
static const char *sopts = "lxf:i:vV";
static const struct option lopts[] = {
@@ -168,7 +194,7 @@ int main(int argc, char **argv)
{ 0 }
};
- progname = "lbxtool"; /* argv[0]; */
+ tool_init("lbxtool", argc, argv);
while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
switch(opt) {
case 'l':
@@ -178,16 +204,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;
-
- if (!freopen(optarg, "rb", state.f)) {
- errmsg("failed to open file %s: %m\n", optarg);
- return EXIT_FAILURE;
- }
+ file = optarg;
break;
case 'i':
/* FIXME: Add index file support. */
@@ -196,7 +213,7 @@ int main(int argc, char **argv)
verbose = 1;
break;
case 'V':
- puts(VERSION_BOILERPLATE("lbxtool"));
+ tool_version();
return EXIT_SUCCESS;
case 'U':
printusage();
@@ -209,25 +226,25 @@ int main(int argc, char **argv)
}
}
- if (fseek(state.f, 0, SEEK_CUR) == 0)
- lbx = lbx_open(state.f, &lbx_default_fops, NULL, name);
+ if (file)
+ lbx = lbx_fopen(file);
else
- lbx = lbx_open(&state, &lbx_pipe_fops, NULL, name);
+ 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;
}
switch (mode) {
case MODE_LIST:
- rc = list(lbx, name, verbose, &argv[optind]);
+ rc = list(lbx, verbose, &argv[optind]);
break;
case MODE_EXTRACT:
- rc = extract(lbx, name, verbose, &argv[optind]);
+ 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);