]> git.draconx.ca Git - slotifier.git/blobdiff - src/slotifier.c
Trivial manual fixes.
[slotifier.git] / src / slotifier.c
index 05ede6b70192b97da4bbffdf584f7d9d5e1530aa..09e5aeecce281f894bca42b8c87630c37eb8c6ff 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Utility to convert overlapping Excellon drill hits into drill slots.
- * Copyright © 2018, 2021 Nick Bowler
+ * Copyright © 2018, 2021, 2023 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
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <locale.h>
 #include <stdint.h>
 #include <assert.h>
+#include <locale.h>
+
 #include <getopt.h>
 #include <gettext.h>
+#include <localcharset.h>
+#include <mbswidth.h>
+
 #include <CNearTree.h>
 #include <gerbv.h>
-#include <striconv.h>
-#include <localcharset.h>
+
+#include "options.h"
+#include "help.h"
+#include "xtra.h"
+#include "copysym.h"
 
 #if !ENABLE_NLS
 #  undef ENABLE_NLS
 
 #define _(x) (gettext(x))
 
-static unsigned verbose;
-
 static const char *progname = "slotifier";
-static const char sopts[] = "o:vVH";
-static const struct option lopts[] = {
-       { "output",  1, NULL, 'o' },
-       { "verbose", 0, NULL, 'v' },
-       { "version", 0, NULL, 'V' },
-       { "help",    0, NULL, 'H' },
-       { 0 }
-};
+static unsigned verbose;
 
 static void print_version(void)
 {
-       const char *copysign = "(C)";
-       void *convsign = NULL;
+       const char *copysign = copyright_symbol(locale_charset());
 
        puts(PACKAGE_STRING);
-
-       if (ENABLE_NLS) {
-               convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset());
-               if (convsign)
-                       copysign = convsign;
-       }
-
-       printf("Copyright %s 2021 Nick Bowler.\n", copysign);
+       printf("Copyright %s 2023 Nick Bowler.\n", copysign);
        puts("License GPLv3+: GNU GPL version 3 or any later version.");
        puts("This is free software: you are free to change and redistribute it.");
        puts("There is NO WARRANTY, to the extent permitted by law.");
-
-       free(convsign);
 }
 
 static void print_usage(FILE *f)
@@ -79,9 +66,10 @@ static void print_usage(FILE *f)
                           progname);
 }
 
-static void print_help(void)
+static void print_help(const struct option *lopts)
 {
        const struct option *opt;
+
        print_usage(stdout);
 
        puts(_("This is \"slotifier\": a tool to convert overlapping drill hits in Excellon\n"
@@ -90,63 +78,23 @@ static void print_help(void)
 
        puts(_("Options:"));
        for (opt = lopts; opt->val; opt++) {
-               const char *line, *text = "ARG";
-               int w = 0;
+               struct lopt_help help;
 
-               if (opt->has_arg) {
-                       switch (opt->val) {
-                       case 'o': text = _("FILE");
-                       }
-
-                       w += printf(_("  -%c, --%s=%s"),
-                                   opt->val, opt->name, text);
-               } else {
-                       w += printf(_("  -%c, --%s"), opt->val, opt->name);
-               }
-
-               if (w > 18) {
-                       putchar('\n');
-                       w = 0;
-               }
-
-               switch (opt->val) {
-               case 'o':
-                       text = _("Output to FILE, instead of standard output.");
-                       break;
-               case 'v':
-                       text = _("Increase verbosity (can be specified more than once).");
-                       break;
-               case 'V':
-                       text = _("Print a version message and then exit.");
-                       break;
-               case 'H':
-                       text = _("Print this message and then exit.");
-                       break;
-               default:
-                       if (w)
-                               putchar('\n');
+               if (!lopt_get_help(opt, &help))
                        continue;
-               }
 
-               for (line = text; line[0];) {
-                       const char *nl = strchr(line, '\n');
-
-                       if (!nl) {
-                               printf("%*s%s\n", 20-w, "", line);
-                               break;
-                       }
-
-                       printf("%*s%.*s\n", 20-w, "", (int)(nl-line), line);
-                       line = nl+1;
-               }
+               help_print_option(opt, help.arg, help.desc, 20);
        }
        putchar('\n');
 
        puts(_("For more information, see the slotifier(1) man page."));
        putchar('\n');
 
-       printf(_("Report bugs to <%s>."), PACKAGE_BUGREPORT);
-       putchar('\n');
+       /*
+        * TRANSLATORS: Please add *another line* indicating where users should
+        * report translation bugs.
+        */
+       printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 }
 
 static void init_i18n(void)
@@ -435,35 +383,33 @@ err_free_tree:
        return ret;
 }
 
-int main(int argc, char **argv)
+static int do_cmdline(int argc, char **argv, const char **outfile)
 {
-       const char *outfile = "/dev/stdout";
-       gerbv_project_t *gp;
-       gerbv_image_t *drill;
-       int opt, ret = 0;
+       const char *sopts = SOPT_STRING;
+       int opt;
+
+       XTRA_PACKED_LOPTS(lopts);
 
        if (argc > 0)
                progname = argv[0];
 
-       init_i18n();
-
        while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
                switch (opt) {
                case 'o':
-                       outfile = optarg;
+                       *outfile = optarg;
                        break;
                case 'v':
                        verbose++;
                        break;
                case 'V':
                        print_version();
-                       return EXIT_SUCCESS;
+                       return 1;
                case 'H':
-                       print_help();
-                       return EXIT_SUCCESS;
+                       print_help(lopts);
+                       return 1;
                default:
                        print_usage(stderr);
-                       return EXIT_FAILURE;
+                       return -1;
                }
        }
 
@@ -471,14 +417,30 @@ int main(int argc, char **argv)
                fprintf(stderr, _("%s: error: must specify a filename\n"),
                                progname);
                print_usage(stderr);
-               return EXIT_FAILURE;
+               return -1;
        }
 
        if (optind + 1 < argc) {
                fprintf(stderr, _("%s: error: excess command-line arguments\n"),
                                progname);
                print_usage(stderr);
-               return EXIT_FAILURE;
+               return -1;
+       }
+
+       return 0;
+}
+
+int main(int argc, char **argv)
+{
+       const char *outfile = "/dev/stdout";
+       gerbv_project_t *gp;
+       gerbv_image_t *drill;
+       int ret = 0;
+
+       init_i18n();
+       switch (do_cmdline(argc, argv, &outfile)) {
+       case -1: return EXIT_FAILURE;
+       case 1: return EXIT_SUCCESS;
        }
 
        gp = gerbv_create_project();