#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(struct 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_file_stat(lbx, i, &stat);
return ret;
}
-int extract(LBX *lbx, int verbose, char **argv) {
- size_t nfiles;
+int extract(struct 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;
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;
}
int mode = MODE_NONE, verbose = 0, opt, rc = EXIT_FAILURE;
struct lbx_pipe_state stdin_handle = { .f = stdin };
const char *file = NULL;
- LBX *lbx;
+ struct lbx *lbx;
static const char *sopts = "lxf:i:vV";
static const struct option lopts[] = {
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;
}