diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-01-11 18:25:23 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-11 18:25:23 +0000 |
commit | 67ea433a97e7821ad489f31af0b2e087144b5617 (patch) | |
tree | c69ba4cc8b1334ffe962061fb8442325c5e674b8 /toolchain/musl/patches/110-getopt_optional_argument_fix.patch | |
parent | 1a59c96060116d50073cd2f236c6175e1c05e185 (diff) | |
download | master-187ad058-67ea433a97e7821ad489f31af0b2e087144b5617.tar.gz master-187ad058-67ea433a97e7821ad489f31af0b2e087144b5617.tar.bz2 master-187ad058-67ea433a97e7821ad489f31af0b2e087144b5617.zip |
musl: merge changes from git, includes further getopt fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43939 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/musl/patches/110-getopt_optional_argument_fix.patch')
-rw-r--r-- | toolchain/musl/patches/110-getopt_optional_argument_fix.patch | 20 |
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; |