X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/1ac4f49c6492354367dd243458892fbdc7765f2b..59d43aadba53b164dc529cfef069c5aeb9a65807:/src/lbxtool.c

diff --git a/src/lbxtool.c b/src/lbxtool.c
index b207666..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-2010 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
@@ -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,
@@ -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;
 		}
 	}
@@ -107,8 +102,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;
 	}
 
@@ -116,26 +110,26 @@ 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;
 	}
 
@@ -164,7 +158,7 @@ int extract(struct lbx *lbx, int verbose, char **argv)
 
 		file = lbx_file_open(lbx, i);
 		if (!file) {
-			errmsg("%s: %s.\n", stat.name, lbx_errmsg());
+			tool_err(-1, "%s: %s", stat.name, lbx_errmsg());
 			continue;
 		}
 
@@ -200,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':
@@ -219,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();
@@ -238,7 +232,7 @@ int main(int argc, char **argv)
 		lbx = lbx_open(&stdin_handle, &lbx_pipe_fops, NULL, "stdin");
 
 	if (!lbx) {
-		errmsg("%s: %s.\n", file ? file : "stdin", lbx_errmsg());
+		tool_err(-1, "%s: %s", file ? file : "stdin", lbx_errmsg());
 		return EXIT_FAILURE;
 	}
 
@@ -250,7 +244,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);