X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/98d285b2abc68892fcf3f0a48a37cfccabd5038c..2c0de0824e7a962fe0bff05972629781cec3fd68:/src/lbxtool.c

diff --git a/src/lbxtool.c b/src/lbxtool.c
index 9f0097a..8a5a428 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 (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
@@ -26,7 +26,7 @@
 
 #include "tools.h"
 #include "lbx.h"
-
+#include "error.h"
 
 static void printusage(void)
 {
@@ -69,19 +69,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(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;
@@ -143,20 +142,19 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
 	return ret;
 }
 
-int extract(LBX *lbx, const char *name, int verbose, char **argv) {
-	size_t nfiles;
+int extract(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;
@@ -166,8 +164,7 @@ int extract(LBX *lbx, const char *name, 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());
+			errmsg("%s: %s.\n", stat.name, lbx_errmsg());
 			continue;
 		}
 
@@ -182,8 +179,8 @@ 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";
+	struct lbx_pipe_state stdin_handle = { .f = stdin };
+	const char *file = NULL;
 	LBX *lbx;
 
 	static const char         *sopts   = "lxf:i:vV";
@@ -213,13 +210,7 @@ int main(int argc, char **argv)
 			mode = MODE_EXTRACT;
 			break;
 		case 'f':
-			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. */
@@ -241,22 +232,22 @@ 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());
+		errmsg("%s: %s.\n", 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);