Convert tools to use option generator script from dxcommon.

[liblbx.git] / src / lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 98d2676dea7294e2527f006172691b239c3e1302..5beaaaeb8f6af6275fa9a16f713fbfa52bd216f4 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -1,7 +1,7 @@
 /*
  *  2ooM: The Master of Orion II Reverse Engineering Project
  *  Simple command-line tool to convert an LBX image to other formats.
- *  Copyright © 2006-2011, 2013-2014 Nick Bowler
+ *  Copyright © 2006-2011, 2013-2014, 2021 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
@@ -27,6 +27,8 @@
 #include <getopt.h>
 #include <errno.h>
 
+#include "help.h"
+
 #include "tools.h"
 #include "image.h"
 #include "error.h"
@@ -41,21 +43,42 @@ static int verbose = 0;
 static char *outname = "out";
 static int usepalette = 1;
 
-enum {
-       OPT_PREFIX = UCHAR_MAX+1,
-};
+#include "imgopts.h"
+static const char sopts[] = SOPT_STRING;
+static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
 
-static void printusage(void)
+static void print_usage(FILE *f)
 {
-       puts("usage: lbximg [-i|-d] [-v] [-p palette_file] [-O override_file]"
-                         " [-f path]");
-       puts("              [-F format] [frameno ...]");
+       const char *progname = tool_invocation();
+
+       fprintf(f, "Usage: %s [options] [-i|-d] [frame ...]\n", progname);
+       if (f != stdout)
+               fprintf(f, "Try %s --help for more information.\n", progname);
 }
 
-static void printhelp(void)
+static void print_help(void)
 {
-       printusage();
-       puts("For now, see the man page for detailed help.");
+       const struct option *opt;
+
+       print_usage(stdout);
+
+       putchar('\n');
+       puts("Options:");
+       for (opt = lopts; opt->name; opt++) {
+               struct lopt_help help;
+               int w;
+
+               if (!lopt_get_help(opt, &help))
+                       continue;
+
+               help_print_option(opt, help.arg, help.desc, 20);
+       }
+       putchar('\n');
+
+       puts("For more information, see the lbximg(1) man page.");
+       putchar('\n');
+
+       printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
 }
 
 enum {
@@ -442,26 +465,6 @@ int main(int argc, char **argv)
        FILE *palf = NULL, *overf = NULL;
        struct lbx_image *img;
 
-       static const char sopts[] = "idnvF:f:p:O:VH";
-       static const struct option lopts[] = {
-               { "identify",      0, NULL, 'i' },
-               { "decode",        0, NULL, 'd' },
-               { "verbose",       0, NULL, 'v' },
-               { "file",          1, NULL, 'f' },
-               { "format",        1, NULL, 'F' },
-               { "palette",       1, NULL, 'p' },
-               { "override",      1, NULL, 'O' },
-               { "no-palette",    0, NULL, 'n' },
-
-               { "output-prefix", 1, NULL,  OPT_PREFIX },
-
-               { "version",       0, NULL, 'V' },
-               { "usage",         0, NULL, 'U' },
-               { "help",          0, NULL, 'H' },
-
-               { 0 }
-       };
-
        tool_init("lbximg", argc, argv);
        while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
                switch(opt) {
@@ -490,17 +493,14 @@ int main(int argc, char **argv)
                case 'O':
                        ovr_palette = optarg;
                        break;
-               case OPT_PREFIX:
+               case LOPT_OUTPUT_PREFIX:
                        outname = optarg;
                        break;
                case 'V':
                        tool_version();
                        return EXIT_SUCCESS;
-               case 'U':
-                       printusage();
-                       return EXIT_SUCCESS;
                case 'H':
-                       printhelp();
+                       print_help();
                        return EXIT_SUCCESS;
                default:
                        return EXIT_FAILURE;