license: Add GNU all-permissive license header to supporting files.

[liblbx.git] / src / lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 730c0af69e1e4e21d9d02b129dd3b506c44f2bb0..d56824c073389b1800ed65c55c8534bff0ca3df0 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -27,6 +27,7 @@
 
 #include <png.h>
 
+#include "tools.h"
 #include "image.h"
 #include "lbx.h"
 
@@ -35,6 +36,19 @@ static int verbose = 0;
 static char *outname = "out";
 static int usepalette = 1;
 
+static void printusage(void)
+{
+       puts("usage: lbximg [-i|-d] [-v] [-p palette_file] [-O override_file]"
+                         " [-f path]");
+       puts("              [frameno ...]");
+}
+
+static void printhelp(void)
+{
+       printusage();
+       puts("For now, see the man page for detailed help.");
+}
+
 static const char *progname;
 #define errmsg(fmt, ...) (\
        fprintf(stderr, "%s: " fmt, progname, __VA_ARGS__)\
@@ -224,7 +238,7 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
        }
        lbximg_getinfo(overimg, &info);
 
-       if (!info.haspalette) {
+       if (!info.palettesz) {
                errmsg("override image has no palette.\n", 0);
                lbximg_close(overimg);
                return -1;
@@ -256,7 +270,7 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
        }
 
        /* For sanity. */
-       if (!palf && !info->haspalette && !override) {
+       if (!palf && !info->palettesz && !override) {
                errmsg("no palette available.\n", 0);
                return -1;
        }
@@ -273,7 +287,7 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
        }
 
        /* Read the embedded palette, if any. */
-       if (info->haspalette && lbximg_getpalette(img, palette) == -1) {
+       if (info->palettesz && lbximg_getpalette(img, palette) == -1) {
                errmsg("error reading embedded palette: %s\n", lbx_strerror());
                return -1;
        }
@@ -356,15 +370,19 @@ int main(int argc, char **argv)
        LBX_IMG *img;
        int opt;
 
-       static const char *sopts = "idvf:p:O:";
+       static const char *sopts = "idvf:p:O:V";
        static const struct option lopts[] = {
-               { "info",     0, NULL, 'i' },
+               { "ident",    0, NULL, 'i' },
                { "decode",   0, NULL, 'd' },
                { "verbose",  0, NULL, 'v' },
                { "file",     1, NULL, 'f' },
                { "palette",  1, NULL, 'p' },
                { "override", 1, NULL, 'p' },
 
+               { "version",  0, NULL, 'V' },
+               { "usage",    0, NULL, 'U' },
+               { "help",     0, NULL, 'H' },
+
                { "nopalette", 0, &usepalette, 0 },
 
                { 0 }
@@ -410,6 +428,15 @@ int main(int argc, char **argv)
                                return EXIT_FAILURE;
                        }
                        break;
+               case 'V':
+                       puts(VERSION_BOILERPLATE("lbximg"));
+                       return EXIT_SUCCESS;
+               case 'U':
+                       printusage();
+                       return EXIT_SUCCESS;
+               case 'H':
+                       printhelp();
+                       return EXIT_SUCCESS;
                case '?':
                case ':':
                        return EXIT_FAILURE;
@@ -433,8 +460,8 @@ int main(int argc, char **argv)
 
                printf("%s is %ux%u LBX image, %u frame(s)%s%s\n",
                       name, info.width, info.height, info.nframes,
-                      info.haspalette ? ", embedded palette" : "",
-                      info.looping    ? ", loops" : "");
+                      info.palettesz ? ", embedded palette" : "",
+                      info.looping   ? ", loops" : "");
        }
 
        switch (mode) {