getopt_long -> yarg

AUTHORS

@@ -6,5 +6,8 @@ Acknowledgements:
 - Phil Karn (KA9Q) originally implemented the error+erasure
   correction codec used by xpar (GPLv2).
 
-Also contains verbatim code written by:
-- Rich Felker (getopt_long shim, Expat/MIT license).
+License: GNU General Public License version 3 or later.
+
+Includes the source code of yarg, a library for parsing command line
+arguments, written by Kamila Szewczyk and licensed under the terms of
+the Creative Commons Zero v1.0 Universal license.

Makefile.am

@@ -1,6 +1,6 @@
 EXTRA_DIST = README.md
 bin_PROGRAMS = xpar
-noinst_HEADERS = platform.h crc32c.h jmode.h smode.h common.h
+noinst_HEADERS = platform.h crc32c.h jmode.h smode.h common.h yarg.h
 xpar_SOURCES = platform.c xpar.c crc32c.c jmode.c smode.c
 
 if XPAR_X86_64

configure.ac

@@ -17,8 +17,8 @@ AC_PROG_MAKE_SET
 AC_PROG_CC
 AM_PROG_AS
 
-AC_CHECK_HEADERS([getopt.h io.h])
-AC_CHECK_FUNCS([getopt_long asprintf strndup stat _commit _setmode isatty fsync mmap CreateFileMappingA])
+AC_CHECK_HEADERS([io.h])
+AC_CHECK_FUNCS([asprintf strndup stat _commit _setmode isatty fsync mmap CreateFileMappingA])
 AC_DEFINE([XPAR_MINOR], [xpar_version_minor], [Minor version number of xpar])
 AC_DEFINE([XPAR_MAJOR], [xpar_version_major], [Major version number of xpar])
 

platform.c

@@ -43,211 +43,6 @@ int asprintf(char **strp, const char *fmt, ...) {
   }
 #endif
 
-#if !defined(HAVE_GETOPT_LONG)
-/*
-  Copyright 2005-2014 Rich Felker, et al.
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-char * optarg;
-int optind = 1, opterr = 1, optopt, __optpos, optreset = 0;
-
-#define optpos __optpos
-
-static void __getopt_msg(const char * a, const char * b, const char * c, size_t l) {
-  FILE * f = stderr;
-  fputs(a, f) >= 0 && fwrite(b, strlen(b), 1, f) && fwrite(c, 1, l, f) == l && putc('\n', f);
-}
-
-int getopt(int argc, char * const argv[], const char * optstring) {
-  int i, c, d;
-  int k, l;
-  char * optchar;
-
-  if (!optind || optreset) {
-    optreset = 0;
-    __optpos = 0;
-    optind = 1;
-  }
-
-  if (optind >= argc || !argv[optind]) return -1;
-
-  if (argv[optind][0] != '-') {
-    if (optstring[0] == '-') {
-      optarg = argv[optind++];
-      return 1;
-    }
-    return -1;
-  }
-
-  if (!argv[optind][1]) return -1;
-
-  if (argv[optind][1] == '-' && !argv[optind][2]) return optind++, -1;
-
-  if (!optpos) optpos++;
-  c = argv[optind][optpos], k = 1;
-  optchar = argv[optind] + optpos;
-  optopt = c;
-  optpos += k;
-
-  if (!argv[optind][optpos]) {
-    optind++;
-    optpos = 0;
-  }
-
-  if (optstring[0] == '-' || optstring[0] == '+') optstring++;
-
-  i = 0;  d = 0;
-  do {
-    d = optstring[i], l = 1;
-    if (l > 0) i += l;
-    else i++;
-  } while (l && d != c);
-
-  if (d != c) {
-    if (optstring[0] != ':' && opterr) __getopt_msg(argv[0], ": unrecognized option: ", optchar, k);
-    return '?';
-  }
-  if (optstring[i] == ':') {
-    if (optstring[i + 1] == ':') optarg = 0;
-    else if (optind >= argc) {
-      if (optstring[0] == ':') return ':';
-      if (opterr) __getopt_msg(argv[0], ": option requires an argument: ", optchar, k);
-      return '?';
-    }
-    if (optstring[i + 1] != ':' || optpos) {
-      optarg = argv[optind++] + optpos;
-      optpos = 0;
-    }
-  }
-  return c;
-}
-
-static void permute(char * const * argv, int dest, int src) {
-  char ** av = (char **)argv;
-  char * tmp = av[src];
-  int i;
-  for (i = src; i > dest; i--) av[i] = av[i - 1];
-  av[dest] = tmp;
-}
-
-static int __getopt_long_core(int argc, char * const * argv, const char * optstring, const struct option * longopts,
-                              int * idx, int longonly) {
-  optarg = 0;
-  if (longopts && argv[optind][0] == '-' &&
-      ((longonly && argv[optind][1] && argv[optind][1] != '-') || (argv[optind][1] == '-' && argv[optind][2]))) {
-    int colon = optstring[optstring[0] == '+' || optstring[0] == '-'] == ':';
-    int i, cnt, match;
-    char * opt;
-    for (cnt = i = 0; longopts[i].name; i++) {
-      const char * name = longopts[i].name;
-      opt = argv[optind] + 1;
-      if (*opt == '-') opt++;
-      for (; *name && *name == *opt; name++, opt++)
-        ;
-      if (*opt && *opt != '=') continue;
-      match = i;
-      if (!*name) {
-        cnt = 1;
-        break;
-      }
-      cnt++;
-    }
-    if (cnt == 1) {
-      i = match;
-      optind++;
-      optopt = longopts[i].val;
-      if (*opt == '=') {
-        if (!longopts[i].has_arg) {
-          if (colon || !opterr) return '?';
-          __getopt_msg(argv[0], ": option does not take an argument: ", longopts[i].name,
-                      strlen(longopts[i].name));
-          return '?';
-        }
-        optarg = opt + 1;
-      } else if (longopts[i].has_arg == required_argument) {
-        if (!(optarg = argv[optind])) {
-          if (colon) return ':';
-          if (!opterr) return '?';
-          __getopt_msg(argv[0], ": option requires an argument: ", longopts[i].name,
-                       strlen(longopts[i].name));
-          return '?';
-        }
-        optind++;
-      }
-      if (idx) *idx = i;
-      if (longopts[i].flag) {
-        *longopts[i].flag = longopts[i].val;
-        return 0;
-      }
-      return longopts[i].val;
-    }
-    if (argv[optind][1] == '-') {
-      if (!colon && opterr)
-        __getopt_msg(argv[0], cnt ? ": option is ambiguous: " : ": unrecognized option: ", argv[optind] + 2,
-                       strlen(argv[optind] + 2));
-      optind++;
-      return '?';
-    }
-  }
-  return getopt(argc, argv, optstring);
-}
-
-static int __getopt_long(int argc, char * const * argv, const char * optstring, const struct option * longopts,
-                         int * idx, int longonly) {
-  int ret, skipped, resumed;
-  if (!optind || optreset) {
-    optreset = 0;
-    __optpos = 0;
-    optind = 1;
-  }
-  if (optind >= argc || !argv[optind]) return -1;
-  skipped = optind;
-  if (optstring[0] != '+' && optstring[0] != '-') {
-    int i;
-    for (i = optind;; i++) {
-      if (i >= argc || !argv[i]) return -1;
-      if (argv[i][0] == '-' && argv[i][1]) break;
-    }
-    optind = i;
-  }
-  resumed = optind;
-  ret = __getopt_long_core(argc, argv, optstring, longopts, idx, longonly);
-  if (resumed > skipped) {
-    int i, cnt = optind - resumed;
-    for (i = 0; i < cnt; i++) permute(argv, skipped, optind - 1);
-    optind = skipped + cnt;
-  }
-  return ret;
-}
-
-int getopt_long(int argc, char * const * argv, const char * optstring, const struct option * longopts, int * idx) {
-  return __getopt_long(argc, argv, optstring, longopts, idx, 0);
-}
-
-int getopt_long_only(int argc, char * const * argv, const char * optstring, const struct option * longopts, int * idx) {
-  return __getopt_long(argc, argv, optstring, longopts, idx, 1);
-}
-#endif
-
 #if defined(HAVE_MMAP)
   #include <sys/mman.h>
   #include <sys/stat.h>

platform.h

@@ -32,31 +32,6 @@
   char * strndup(const char *s, sz n);
 #endif
 
-// ============================================================================
-//  Potential shim for getopt/getopt_long if not present.
-// ============================================================================
-#if !defined(HAVE_GETOPT_LONG)
-  int getopt(int, char * const[], const char *);
-  extern char * optarg;
-  extern int optind, opterr, optopt, optreset;
-
-  struct option {
-    const char * name;
-    int has_arg;
-    int * flag;
-    int val;
-  };
-
-  int getopt_long(int, char * const *, const char *, const struct option *, int *);
-  int getopt_long_only(int, char * const *, const char *, const struct option *, int *);
-
-  #define no_argument 0
-  #define required_argument 1
-  #define optional_argument 2
-#else
-  #include <getopt.h>
-#endif
-
 // ============================================================================
 //  Cross-platform (Linux + Windows) file mapping interface.
 // ============================================================================