elf.h: add ELFCOMPRESS_ZSTD

[musl] / src / misc / getopt_long.c

diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
index 6d3a4a6..6949ab1 100644 (file)
--- a/src/misc/getopt_long.c
+++ b/src/misc/getopt_long.c
@@ -1,31 +1,120 @@
 #define _GNU_SOURCE
 #include <stddef.h>
+#include <stdlib.h>
+#include <limits.h>
 #include <getopt.h>
 #include <stdio.h>
+#include <string.h>
+#include "stdio_impl.h"
+
+extern int __optpos, __optreset;
+
+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);
 
 static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
 {
-       if (optind >= argc || !argv[optind] || argv[optind][0] != '-') return -1;
-       if ((longonly && argv[optind][1]) ||
-               (argv[optind][1] == '-' && argv[optind][2]))
-       {
+       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=0; longopts[i].name; 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;
+}
+
+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 *arg, *opt, *start = argv[optind]+1;
+               for (cnt=i=0; longopts[i].name; i++) {
                        const char *name = longopts[i].name;
-                       char *opt = argv[optind]+1;
+                       opt = start;
                        if (*opt == '-') opt++;
-                       for (; *name && *name == *opt; name++, opt++);
-                       if (*name || (*opt && *opt != '=')) continue;
+                       while (*opt && *opt != '=' && *opt == *name)
+                               name++, opt++;
+                       if (*opt && *opt != '=') continue;
+                       arg = opt;
+                       match = i;
+                       if (!*name) {
+                               cnt = 1;
+                               break;
+                       }
+                       cnt++;
+               }
+               if (cnt==1 && longonly && arg-start == mblen(start, MB_LEN_MAX)) {
+                       int l = arg-start;
+                       for (i=0; optstring[i]; i++) {
+                               int j;
+                               for (j=0; j<l && start[j]==optstring[i+j]; j++);
+                               if (j==l) {
+                                       cnt++;
+                                       break;
+                               }
+                       }
+               }
+               if (cnt==1) {
+                       i = match;
+                       opt = arg;
+                       optind++;
                        if (*opt == '=') {
-                               if (!longopts[i].has_arg) continue;
+                               if (!longopts[i].has_arg) {
+                                       optopt = longopts[i].val;
+                                       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]))
-                                               return ':';
-                               } else optarg = NULL;
+                       } else if (longopts[i].has_arg == required_argument) {
+                               if (!(optarg = argv[optind])) {
+                                       optopt = longopts[i].val;
+                                       if (colon) return ':';
+                                       if (!opterr) return '?';
+                                       __getopt_msg(argv[0],
+                                               ": option requires an argument: ",
+                                               longopts[i].name,
+                                               strlen(longopts[i].name));
+                                       return '?';
+                               }
+                               optind++;
                        }
-                       optind++;
                        if (idx) *idx = i;
                        if (longopts[i].flag) {
                                *longopts[i].flag = longopts[i].val;
@@ -34,6 +123,13 @@ static int __getopt_long(int argc, char *const *argv, const char *optstring, con
                        return longopts[i].val;
                }
                if (argv[optind][1] == '-') {
+                       optopt = 0;
+                       if (!colon && opterr)
+                               __getopt_msg(argv[0], cnt ?
+                                       ": option is ambiguous: " :
+                                       ": unrecognized option: ",
+                                       argv[optind]+2,
+                                       strlen(argv[optind]+2));
                        optind++;
                        return '?';
                }