/*
* 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
#include "tools.h"
#include "lbx.h"
-
+#include "error.h"
static void printusage(void)
{
return i ? -1: 0;
}
-int list(LBX *lbx, 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;
return ret;
}
-int extract(LBX *lbx, 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;
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;
}
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;
}