* [PATCH v2] getopt: add support for non-option arguments
@ 2014-11-25 7:56 Gianluca Anzolin
2014-12-03 0:06 ` Rich Felker
0 siblings, 1 reply; 2+ messages in thread
From: Gianluca Anzolin @ 2014-11-25 7:56 UTC (permalink / raw)
To: musl; +Cc: Gianluca Anzolin
Currently getopt() doesn't handle the GNU getopt extension that allows
to parse non-option arguments when optstring starts with '-'.
This extensions is used by some common utilities, notably iptables, that
currently return with errors even with perfectly valid invocations, for
example:
$ iptables -A INPUT -p tcp ! --syn -m state --state NEW -j DROP
The patch add the code needed to implement this extension to getopt.c
and getopt_long.c
v2: do not add a second path to return getopt(...) to getopt_long.c
Signed-off-by: Gianluca Anzolin <gianluca@sottospazio.it>
---
src/misc/getopt.c | 17 ++++++++++++++++-
src/misc/getopt_long.c | 7 ++++---
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/misc/getopt.c b/src/misc/getopt.c
index f94c4f7..a698c8d 100644
--- a/src/misc/getopt.c
+++ b/src/misc/getopt.c
@@ -24,8 +24,20 @@ int getopt(int argc, char * const argv[], const char *optstring)
optind = 1;
}
- if (optind >= argc || !argv[optind] || argv[optind][0] != '-' || !argv[optind][1])
+ if (optind >= argc || !argv[optind])
return -1;
+
+ if (argv[optind][0] != '-') {
+ if (optstring[0] == '-') {
+ optarg = argv[optind++];
+ return 1;
+ }
+ return -1;
+ }
+
+ if (!argv[optind][1])
+ return -1;
+
if (argv[optind][1] == '-' && !argv[optind][2])
return optind++, -1;
@@ -43,6 +55,9 @@ int getopt(int argc, char * const argv[], const char *optstring)
optpos = 0;
}
+ if (optstring[0] == '-')
+ optstring++;
+
for (i=0; (l = mbtowc(&d, optstring+i, MB_LEN_MAX)) && d!=c; i+=l>0?l:1);
if (d != c) {
diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
index 4ef5a5c..3d318ce 100644
--- a/src/misc/getopt_long.c
+++ b/src/misc/getopt_long.c
@@ -12,9 +12,10 @@ static int __getopt_long(int argc, char *const *argv, const char *optstring, con
__optpos = 0;
optind = 1;
}
- if (optind >= argc || !argv[optind] || argv[optind][0] != '-') return -1;
- if ((longonly && argv[optind][1]) ||
- (argv[optind][1] == '-' && argv[optind][2]))
+ if (optind >= argc || !argv[optind]) return -1;
+ if (argv[optind][0] == '-' &&
+ ((longonly && argv[optind][1]) ||
+ (argv[optind][1] == '-' && argv[optind][2])))
{
int i;
for (i=0; longopts[i].name; i++) {
--
2.1.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] getopt: add support for non-option arguments
2014-11-25 7:56 [PATCH v2] getopt: add support for non-option arguments Gianluca Anzolin
@ 2014-12-03 0:06 ` Rich Felker
0 siblings, 0 replies; 2+ messages in thread
From: Rich Felker @ 2014-12-03 0:06 UTC (permalink / raw)
To: musl
On Tue, Nov 25, 2014 at 08:56:03AM +0100, Gianluca Anzolin wrote:
> Currently getopt() doesn't handle the GNU getopt extension that allows
> to parse non-option arguments when optstring starts with '-'.
>
> This extensions is used by some common utilities, notably iptables, that
> currently return with errors even with perfectly valid invocations, for
> example:
>
> $ iptables -A INPUT -p tcp ! --syn -m state --state NEW -j DROP
>
> The patch add the code needed to implement this extension to getopt.c
> and getopt_long.c
>
> v2: do not add a second path to return getopt(...) to getopt_long.c
>
> Signed-off-by: Gianluca Anzolin <gianluca@sottospazio.it>
Committed. Thanks!
Rich
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-03 0:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-25 7:56 [PATCH v2] getopt: add support for non-option arguments Gianluca Anzolin
2014-12-03 0:06 ` Rich Felker
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).