aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-11-19 09:21:02 +0000
committerJohn Crispin <blogic@openwrt.org>2014-11-19 09:21:02 +0000
commit013b2bcd25c3ad50cc9e869670801a2a92292f10 (patch)
tree2173535988b704728036a59947f7b9d1008b94c6 /toolchain
parentc3e4dee7574a5d6bcdcf913fa7ec5d2e61d35f45 (diff)
downloadupstream-013b2bcd25c3ad50cc9e869670801a2a92292f10.tar.gz
upstream-013b2bcd25c3ad50cc9e869670801a2a92292f10.tar.bz2
upstream-013b2bcd25c3ad50cc9e869670801a2a92292f10.zip
musl: add getopt support for non-option arguments
musl libc doesn't support the GNU getopt extension to parse non-option arguments when the optstring starts with '-'. This extension is used by some utilities, notably iptables, that currently return with errors even with perfectly valid invocations. The patch adds the code needed by getopt.c and getopt_long.c to implement that extension. Signed-off-by: Gianluca Anzolin <gianluca@sottospazio.it> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43309 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch b/toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch
new file mode 100644
index 0000000000..3cd909da46
--- /dev/null
+++ b/toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch
@@ -0,0 +1,43 @@
+--- a/src/misc/getopt.c
++++ b/src/misc/getopt.c
+@@ -24,8 +24,23 @@ int getopt(int argc, char * const argv[]
+ optind = 1;
+ }
+
+- if (optind >= argc || !argv[optind] || argv[optind][0] != '-' || !argv[optind][1])
++ if (optind >= argc || !argv[optind])
+ return -1;
++
++ if (argv[optind][0] != '-') {
++ /* GNU extension */
++ if (optstring[0] == '-') {
++ optarg = argv[optind];
++ optind++;
++ return 1;
++ }
++
++ return -1;
++ }
++
++ if (!argv[optind][1])
++ return -1;
++
+ if (argv[optind][1] == '-' && !argv[optind][2])
+ return optind++, -1;
+
+--- a/src/misc/getopt_long.c
++++ b/src/misc/getopt_long.c
+@@ -12,7 +12,12 @@ static int __getopt_long(int argc, char
+ __optpos = 0;
+ optind = 1;
+ }
+- if (optind >= argc || !argv[optind] || argv[optind][0] != '-') return -1;
++ if (optind >= argc || !argv[optind])
++ return -1;
++
++ if (argv[optind][0] != '-')
++ return getopt(argc, argv, optstring);
++
+ if ((longonly && argv[optind][1]) ||
+ (argv[optind][1] == '-' && argv[optind][2]))
+ {