int main(int argc, char **argv)
{
int mode = MODE_NONE, opt, rc = EXIT_FAILURE;
- struct lbx_pipe_state state = { .f = stdin };
+ struct lbx_pipe_state stdin_handle = { .f = stdin };
FILE *palf = NULL, *overf = NULL;
- const char *name = "stdin";
+ const char *file = NULL;
LBX_IMG *img;
static const char *sopts = "idvf:p:O:V";
verbose = 1;
break;
case 'f':
- name = strrchr(optarg, '/');
- name = name ? name+1 : optarg;
-
- if (!freopen(optarg, "rb", state.f)) {
- errmsg("failed to open %s: %m\n", optarg);
- return EXIT_FAILURE;
- }
+ file = optarg;
break;
case 'p':
palf = fopen(optarg, "rb");
return EXIT_FAILURE;
}
- if (fseek(state.f, 0, SEEK_CUR) == 0)
- img = lbximg_open(state.f, &lbx_default_fops, NULL);
+ if (file)
+ img = lbximg_fopen(file);
else
- img = lbximg_open(&state, &lbx_pipe_fops, NULL);
+ img = lbximg_open(&stdin_handle, &lbx_pipe_fops, NULL);
if (!img) {
errmsg("failed to open image: %s.\n", lbx_strerror());
if (verbose || mode == MODE_IDENT) {
struct lbx_imginfo info;
- lbximg_getinfo(img, &info);
+ if (!file)
+ file = "stdin";
+
+ lbximg_getinfo(img, &info);
printf("%s is %ux%u LBX image, %u frame(s)%s%s\n",
- name, info.width, info.height, info.nframes,
+ file, info.width, info.height, info.nframes,
info.palettesz ? ", embedded palette" : "",
info.chunk ? ", chunked" : "",
info.looping ? ", loops" : "");