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

diff --git a/src/lbxtool.c b/src/lbxtool.c
index d070e8f..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
@@ -16,16 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _GNU_SOURCE
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <getopt.h>
 #include <fnmatch.h>
 
 #include "tools.h"
 #include "lbx.h"
-
+#include "error.h"
 
 static void printusage(void)
 {
@@ -51,7 +52,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)) {
@@ -68,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;
@@ -99,22 +99,62 @@ 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) {
+		errmsg("%s: fopen: %s\n",
+			stat->name, strerror(errno));
+		return -1;
+	}
+
+	while (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 < sizeof buf) {
+			if (lbx_file_eof(f))
+				ret = 0;
+			break;
+		}
+	}
+
+	if (fclose(of) == EOF) {
+		errmsg("%s: fclose: %s\n", stat->name, strerror(errno));
+		return -1;
+	}
+
+	return ret;
+}
+
+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;
-		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;
@@ -122,22 +162,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) {
+			errmsg("%s: %s.\n", 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;
@@ -146,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";
@@ -177,16 +210,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. */
@@ -208,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);