From: "Daniel Cegiełka" <daniel.cegielka@gmail.com>
To: musl@lists.openwall.com
Subject: Re: better compatibility with bsd getopt()
Date: Sun, 30 Sep 2012 23:32:44 +0200 [thread overview]
Message-ID: <CAPLrYETtdr+O5odZcnRzbnjiLkMpRMdV-tGsQT7ZwZ9d_OcD7w@mail.gmail.com> (raw)
In-Reply-To: <20120930211329.GP254@brightrain.aerifal.cx>
[-- Attachment #1: Type: text/plain, Size: 711 bytes --]
2012/9/30 Rich Felker <dalias@aerifal.cx>:
>> OpenBSD solves gnu reset option in this way:
>>
>> /*
>> * XXX Some GNU programs (like cvs) set optind to 0 instead of
>> * XXX using optreset. Work around this braindamage.
>> */
>> if (optind == 0)
>> optind = optreset = 1;
>
> Except the BSD way is the braindamaged one because it violates the
> namespace. The GNU way simply defines something that was previously
> undefined by the standard without affecting the namespace.
>
> If needed, I think it's possible to support both, with some weak
> symbol hacks...
sample solution for gnu/bsd getopt() - of course this patch needs this
weak symbol hacks...
Daniel
[-- Attachment #2: musl_gnu_bsd_getopt_reset.diff --]
[-- Type: application/octet-stream, Size: 1041 bytes --]
diff -urN musl.orig/include/getopt.h musl/include/getopt.h
--- musl.orig/include/getopt.h Sun Sep 30 21:20:38 2012
+++ musl/include/getopt.h Sun Sep 30 21:23:14 2012
@@ -7,7 +7,7 @@
int getopt(int, char * const [], const char *);
extern char *optarg;
-extern int optind, opterr, optopt;
+extern int optind, opterr, optopt, optreset;
struct option
{
diff -urN musl.orig/src/misc/getopt.c musl/src/misc/getopt.c
--- musl.orig/src/misc/getopt.c Sun Sep 30 21:20:38 2012
+++ musl/src/misc/getopt.c Sun Sep 30 21:22:57 2012
@@ -5,7 +5,7 @@
#include <stdlib.h>
char *optarg;
-int optind=1, opterr=1, optopt;
+int optind=1, opterr=1, optopt, optreset=0;
static int optpos;
int getopt(int argc, char * const argv[], const char *optstring)
@@ -15,6 +15,12 @@
int k, l;
char *optchar;
+ if (!optind)
+ optind = optreset = 1;
+ if (optreset) {
+ optreset = 0;
+ optind = 1;
+ }
if (optind >= argc || !argv[optind] || argv[optind][0] != '-' || !argv[optind][1])
return -1;
if (argv[optind][1] == '-' && !argv[optind][2])
next prev parent reply other threads:[~2012-09-30 21:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-30 20:30 Daniel Cegiełka
2012-09-30 20:28 ` Rich Felker
2012-09-30 21:02 ` John Spencer
2012-09-30 21:00 ` Rich Felker
2012-09-30 21:18 ` Daniel Cegiełka
2012-09-30 21:13 ` Rich Felker
2012-09-30 21:32 ` Daniel Cegiełka [this message]
2012-09-30 23:53 ` Rich Felker
2012-09-30 23:54 ` Rich Felker
2012-10-01 0:03 ` Rich Felker
2012-09-30 21:06 ` Daniel Cegiełka
2012-09-30 21:22 ` John Spencer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPLrYETtdr+O5odZcnRzbnjiLkMpRMdV-tGsQT7ZwZ9d_OcD7w@mail.gmail.com \
--to=daniel.cegielka@gmail.com \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).