use syscall_arg_t and __scc macro for arguments to __alt_socketcall

[musl] / src / misc / getopt_long.c

diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
index e5a4a75..6949ab1 100644 (file)
--- a/src/misc/getopt_long.c
+++ b/src/misc/getopt_long.c
@@ -1,8 +1,11 @@
 #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;
 
@@ -16,14 +19,11 @@ static void permute(char *const *argv, int dest, int src)
        av[dest] = tmp;
 }
 
-void __getopt_msg(const char *, const char *, const char *, size_t);
-
 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)
 {
        int ret, skipped, resumed;
-       const char *optstring2 = optstring + 1;
        if (!optind || __optreset) {
                __optreset = 0;
                __optpos = 0;
@@ -38,10 +38,9 @@ static int __getopt_long(int argc, char *const *argv, const char *optstring, con
                        if (argv[i][0] == '-' && argv[i][1]) break;
                }
                optind = i;
-               optstring2 = optstring;
        }
        resumed = optind;
-       ret = __getopt_long_core(argc, argv, optstring2, longopts, idx, longonly);
+       ret = __getopt_long_core(argc, argv, optstring, longopts, idx, longonly);
        if (resumed > skipped) {
                int i, cnt = optind-resumed;
                for (i=0; i<cnt; i++)
@@ -53,19 +52,22 @@ static int __getopt_long(int argc, char *const *argv, const char *optstring, con
 
 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]) ||
+               ((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;
+               char *arg, *opt, *start = argv[optind]+1;
                for (cnt=i=0; longopts[i].name; i++) {
                        const char *name = longopts[i].name;
-                       opt = argv[optind]+1;
+                       opt = start;
                        if (*opt == '-') opt++;
-                       for (; *name && *name == *opt; name++, opt++);
+                       while (*opt && *opt != '=' && *opt == *name)
+                               name++, opt++;
                        if (*opt && *opt != '=') continue;
+                       arg = opt;
                        match = i;
                        if (!*name) {
                                cnt = 1;
@@ -73,13 +75,25 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
                        }
                        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++;
-                       optopt = longopts[i].val;
                        if (*opt == '=') {
                                if (!longopts[i].has_arg) {
-                                       if (optstring[0] == ':' || !opterr)
+                                       optopt = longopts[i].val;
+                                       if (colon || !opterr)
                                                return '?';
                                        __getopt_msg(argv[0],
                                                ": option does not take an argument: ",
@@ -88,19 +102,18 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
                                        return '?';
                                }
                                optarg = opt+1;
-                       } else {
-                               if (longopts[i].has_arg == required_argument) {
-                                       if (!(optarg = argv[optind])) {
-                                               if (optstring[0] == ':' || !opterr)
-                                                       return ':';
-                                               __getopt_msg(argv[0],
-                                                       ": option requires an argument: ",
-                                                       longopts[i].name,
-                                                       strlen(longopts[i].name));
-                                               return '?';
-                                       }
-                                       optind++;
-                               } 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++;
                        }
                        if (idx) *idx = i;
                        if (longopts[i].flag) {
@@ -110,7 +123,8 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
                        return longopts[i].val;
                }
                if (argv[optind][1] == '-') {
-                       if (optstring[0] != ':' && opterr)
+                       optopt = 0;
+                       if (!colon && opterr)
                                __getopt_msg(argv[0], cnt ?
                                        ": option is ambiguous: " :
                                        ": unrecognized option: ",