aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-01-11 18:25:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-01-11 18:25:23 +0000
commit63176d7e1ed8817b9219e24caa6182dc2acb77e8 (patch)
tree8a34f8522b55a238215958fe6f3df475bb99bd29 /toolchain/musl/patches/110-getopt_optional_argument_fix.patch
parent9db3df9d6b347df66785a6909bec1122869f1503 (diff)
downloadupstream-63176d7e1ed8817b9219e24caa6182dc2acb77e8.tar.gz
upstream-63176d7e1ed8817b9219e24caa6182dc2acb77e8.tar.bz2
upstream-63176d7e1ed8817b9219e24caa6182dc2acb77e8.zip
musl: merge changes from git, includes further getopt fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43939
Diffstat (limited to 'toolchain/musl/patches/110-getopt_optional_argument_fix.patch')
-rw-r--r--toolchain/musl/patches/110-getopt_optional_argument_fix.patch20
1 files changed, 0 insertions, 20 deletions
diff --git a/toolchain/musl/patches/110-getopt_optional_argument_fix.patch b/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
deleted file mode 100644
index 7deebdc251..0000000000
--- a/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/misc/getopt.c
-+++ b/src/misc/getopt.c
-@@ -55,7 +55,9 @@ int getopt(int argc, char * const argv[]
- return '?';
- }
- if (optstring[i+1] == ':') {
-+ if (optstring[i+2] == ':') optarg = 0;
- if (optind >= argc) {
-+ if (optstring[i+2] == ':') return c;
- if (optstring[0] == ':') return ':';
- if (opterr) {
- write(2, argv[0], strlen(argv[0]));
-@@ -65,7 +67,6 @@ int getopt(int argc, char * const argv[]
- }
- return '?';
- }
-- if (optstring[i+2] == ':') optarg = 0;
- if (optstring[i+2] != ':' || optpos) {
- optarg = argv[optind++] + optpos;
- optpos = 0;