/*
* 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
for (i = 0; i < 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;
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;
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";
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. */
}
}
- 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());