return i ? -1: 0;
}
-int list(LBX *lbx, const char *name, int verbose, char **argv) {
+int list(LBX *lbx, int verbose, char **argv) {
size_t nfiles;
unsigned int i;
return ret;
}
-int extract(LBX *lbx, const char *name, int verbose, char **argv) {
+int extract(LBX *lbx, int verbose, char **argv) {
size_t nfiles;
unsigned int i;
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());
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);