gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify musl's getopt, including removing optind, optopt, opterr, idx, and longonly

Browse Source
This commit is contained in:
Rangi
2025-10-23 13:13:18 -04:00
parent efb5a88edb
commit 8bedd710d7
3 changed files with 131 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/extern/getopt.hpp vendored
View File

@@ -12,7 +12,7 @@ static constexpr int optional_argument = 2;
// clang-format on // clang-format on
extern char *musl_optarg; extern char *musl_optarg;
extern int musl_optind, musl_opterr, musl_optopt, musl_optreset; extern int musl_optind, musl_optopt;
struct option { struct option {
char const *name; char const *name;
@@ -21,8 +21,6 @@ struct option {
int val; int val;
}; };
int musl_getopt_long_only( int musl_getopt_long_only(int argc, char **argv, char const *optstring, option const *longopts);
int argc, char **argv, char const *optstring, option const *longopts, int *idx
);
#endif // RGBDS_EXTERN_GETOPT_HPP #endif // RGBDS_EXTERN_GETOPT_HPP

3
src/cli.cpp
View File

@@ -94,8 +94,7 @@ void cli_ParseArgs(
for (;;) { for (;;) {
char *atFileName = nullptr; char *atFileName = nullptr;
for (int ch; for (int ch;
(ch = musl_getopt_long_only(curArgc, curArgv, optString.c_str(), longOpts, nullptr)) (ch = musl_getopt_long_only(curArgc, curArgv, optString.c_str(), longOpts)) != -1;) {
!= -1;) {
if (ch == 1 && musl_optarg[0] == '@') { if (ch == 1 && musl_optarg[0] == '@') {
atFileName = &musl_optarg[1]; atFileName = &musl_optarg[1];
break; break;

200
src/extern/getopt.cpp vendored
View File

@@ -14,30 +14,21 @@
#include "style.hpp" #include "style.hpp"
char *musl_optarg; char *musl_optarg;
int musl_optind = 1, musl_opterr = 1, musl_optopt; int musl_optind = 1, musl_optopt;
int musl_optreset = 0;
static int musl_optpos; static int musl_optpos;
static void musl_getopt_msg(char const *msg, char const *param, size_t len) { static void musl_getopt_msg(char const *msg, char const *param) {
FILE *f = stderr; style_Set(stderr, STYLE_RED, true);
fputs("error: ", stderr);
style_Set(f, STYLE_RED, true); style_Reset(stderr);
fputs("error: ", f); fputs(msg, stderr);
style_Reset(f); fputs(param, stderr);
putc('\n', stderr);
if (fwrite(msg, strlen(msg), 1, f) && fwrite(param, 1, len, f) == len) {
putc('\n', f);
}
} }
static int getopt(int argc, char *argv[], char const *optstring) { static int musl_getopt(int argc, char *argv[], char const *optstring) {
int i; if (!musl_optind) {
wchar_t c, d;
int k, l;
char *optchar;
if (!musl_optind || musl_optreset) {
musl_optreset = 0;
musl_optpos = 0; musl_optpos = 0;
musl_optind = 1; musl_optind = 1;
} }
@@ -46,7 +37,9 @@ static int getopt(int argc, char *argv[], char const *optstring) {
return -1; return -1;
} }
if (argv[musl_optind][0] != '-') { char *argi = argv[musl_optind];
if (argi[0] != '-') {
if (optstring[0] == '-') { if (optstring[0] == '-') {
musl_optarg = argv[musl_optind++]; musl_optarg = argv[musl_optind++];
return 1; return 1;
@@ -54,26 +47,28 @@ static int getopt(int argc, char *argv[], char const *optstring) {
return -1; return -1;
} }
if (!argv[musl_optind][1]) { if (!argi[1]) {
return -1; return -1;
} }
if (argv[musl_optind][1] == '-' && !argv[musl_optind][2]) { if (argi[1] == '-' && !argi[2]) {
return musl_optind++, -1; ++musl_optind;
return -1;
} }
if (!musl_optpos) { if (!musl_optpos) {
++musl_optpos; ++musl_optpos;
} }
k = mbtowc(&c, argv[musl_optind] + musl_optpos, MB_LEN_MAX); wchar_t c;
int k = mbtowc(&c, argi + musl_optpos, MB_LEN_MAX);
if (k < 0) { if (k < 0) {
k = 1; k = 1;
c = 0xFFFD; // replacement char c = 0xFFFD; // replacement char
} }
optchar = argv[musl_optind] + musl_optpos; char *optchar = argi + musl_optpos;
musl_optpos += k; musl_optpos += k;
if (!argv[musl_optind][musl_optpos]) { if (!argi[musl_optpos]) {
++musl_optind; ++musl_optind;
musl_optpos = 0; musl_optpos = 0;
} }
@@ -82,8 +77,9 @@ static int getopt(int argc, char *argv[], char const *optstring) {
++optstring; ++optstring;
} }
i = 0; int i = 0;
d = 0; wchar_t d = 0;
int l;
do { do {
l = mbtowc(&d, optstring + i, MB_LEN_MAX); l = mbtowc(&d, optstring + i, MB_LEN_MAX);
if (l > 0) { if (l > 0) {
@@ -95,8 +91,8 @@ static int getopt(int argc, char *argv[], char const *optstring) {
if (d != c || c == ':') { if (d != c || c == ':') {
musl_optopt = c; musl_optopt = c;
if (optstring[0] != ':' && musl_opterr) { if (optstring[0] != ':') {
musl_getopt_msg("unrecognized option: ", optchar, k); musl_getopt_msg("unrecognized option: ", optchar);
} }
return '?'; return '?';
} }
@@ -111,9 +107,7 @@ static int getopt(int argc, char *argv[], char const *optstring) {
if (optstring[0] == ':') { if (optstring[0] == ':') {
return ':'; return ':';
} }
if (musl_opterr) { musl_getopt_msg("option requires an argument: ", optchar);
musl_getopt_msg("option requires an argument: ", optchar, k);
}
return '?'; return '?';
} }
} }
@@ -122,73 +116,27 @@ static int getopt(int argc, char *argv[], char const *optstring) {
static void permute(char **argv, int dest, int src) { static void permute(char **argv, int dest, int src) {
char *tmp = argv[src]; char *tmp = argv[src];
int i; for (int i = src; i > dest; --i) {
for (i = src; i > dest; --i) {
argv[i] = argv[i - 1]; argv[i] = argv[i - 1];
} }
argv[dest] = tmp; argv[dest] = tmp;
} }
static int musl_getopt_long_core( static int
int argc, char **argv, char const *optstring, option const *longopts, int *idx, int longonly musl_getopt_long_core(int argc, char **argv, char const *optstring, option const *longopts) {
);
static int musl_getopt_long(
int argc, char **argv, char const *optstring, option const *longopts, int *idx, int longonly
) {
int ret, skipped, resumed;
if (!musl_optind || musl_optreset) {
musl_optreset = 0;
musl_optpos = 0;
musl_optind = 1;
}
if (musl_optind >= argc || !argv[musl_optind]) {
return -1;
}
skipped = musl_optind;
if (optstring[0] != '+' && optstring[0] != '-') {
int i;
for (i = musl_optind;; ++i) {
if (i >= argc || !argv[i]) {
return -1;
}
if (argv[i][0] == '-' && argv[i][1]) {
break;
}
}
musl_optind = i;
}
resumed = musl_optind;
ret = musl_getopt_long_core(argc, argv, optstring, longopts, idx, longonly);
if (resumed > skipped) {
int i, cnt = musl_optind - resumed;
for (i = 0; i < cnt; ++i) {
permute(argv, skipped, musl_optind - 1);
}
musl_optind = skipped + cnt;
}
return ret;
}
static int musl_getopt_long_core(
int argc, char **argv, char const *optstring, option const *longopts, int *idx, int longonly
) {
musl_optarg = 0; musl_optarg = 0;
if (longopts && argv[musl_optind][0] == '-' if (char *argi = argv[musl_optind];
&& ((longonly && argv[musl_optind][1] && argv[musl_optind][1] != '-') !longopts || argi[0] != '-'
|| (argv[musl_optind][1] == '-' && argv[musl_optind][2]))) { || ((!argi[1] || argi[1] == '-') && (argi[1] != '-' || !argi[2]))) {
int colon = optstring[optstring[0] == '+' || optstring[0] == '-'] == ':'; return musl_getopt(argc, argv, optstring);
int i, cnt, match = 0; }
bool colon = optstring[optstring[0] == '+' || optstring[0] == '-'] == ':';
int i = 0, cnt = 0, match = 0;
char *arg = 0, *opt, *start = argv[musl_optind] + 1; char *arg = 0, *opt, *start = argv[musl_optind] + 1;
for (cnt = i = 0; longopts[i].name; ++i) { for (; longopts[i].name; ++i) {
char const *name = longopts[i].name; char const *name = longopts[i].name;
opt = start; opt = start;
if (*opt == '-') { if (*opt == '-') {
++opt; ++opt;
@@ -208,12 +156,10 @@ static int musl_getopt_long_core(
} }
++cnt; ++cnt;
} }
if (cnt == 1 && longonly && arg - start == mblen(start, MB_LEN_MAX)) { if (cnt == 1 && arg - start == mblen(start, MB_LEN_MAX)) {
int l = arg - start; int l = arg - start;
for (i = 0; optstring[i]; ++i) { for (i = 0; optstring[i]; ++i) {
int j = 0; int j = 0;
while (j < l && start[j] == optstring[i + j]) { while (j < l && start[j] == optstring[i + j]) {
++j; ++j;
} }
@@ -230,14 +176,10 @@ static int musl_getopt_long_core(
if (*opt == '=') { if (*opt == '=') {
if (!longopts[i].has_arg) { if (!longopts[i].has_arg) {
musl_optopt = longopts[i].val; musl_optopt = longopts[i].val;
if (colon || !musl_opterr) { if (colon) {
return '?'; return '?';
} }
musl_getopt_msg( musl_getopt_msg("option does not take an argument: ", longopts[i].name);
"option does not take an argument: ",
longopts[i].name,
strlen(longopts[i].name)
);
return '?'; return '?';
} }
musl_optarg = opt + 1; musl_optarg = opt + 1;
@@ -248,19 +190,11 @@ static int musl_getopt_long_core(
if (colon) { if (colon) {
return ':'; return ':';
} }
if (!musl_opterr) { musl_getopt_msg("option requires an argument: ", longopts[i].name);
return '?';
}
musl_getopt_msg(
"option requires an argument: ", longopts[i].name, strlen(longopts[i].name)
);
return '?'; return '?';
} }
++musl_optind; ++musl_optind;
} }
if (idx) {
*idx = i;
}
if (longopts[i].flag) { if (longopts[i].flag) {
*longopts[i].flag = longopts[i].val; *longopts[i].flag = longopts[i].val;
return 0; return 0;
@@ -269,22 +203,48 @@ static int musl_getopt_long_core(
} }
if (argv[musl_optind][1] == '-') { if (argv[musl_optind][1] == '-') {
musl_optopt = 0; musl_optopt = 0;
if (!colon && musl_opterr) { if (!colon) {
musl_getopt_msg( musl_getopt_msg(
cnt ? "option is ambiguous: " : "unrecognized option: ", cnt ? "option is ambiguous: " : "unrecognized option: ", argv[musl_optind] + 2
argv[musl_optind] + 2,
strlen(argv[musl_optind] + 2)
); );
} }
++musl_optind; ++musl_optind;
return '?'; return '?';
} }
} return musl_getopt(argc, argv, optstring);
return getopt(argc, argv, optstring);
} }
int musl_getopt_long_only( int musl_getopt_long_only(int argc, char **argv, char const *optstring, option const *longopts) {
int argc, char **argv, char const *optstring, option const *longopts, int *idx if (!musl_optind) {
) { musl_optpos = 0;
return musl_getopt_long(argc, argv, optstring, longopts, idx, 1); musl_optind = 1;
}
if (musl_optind >= argc || !argv[musl_optind]) {
return -1;
}
int skipped = musl_optind;
if (optstring[0] != '+' && optstring[0] != '-') {
int i = musl_optind;
for (;; ++i) {
if (i >= argc || !argv[i]) {
return -1;
}
if (argv[i][0] == '-' && argv[i][1]) {
break;
}
}
musl_optind = i;
}
int resumed = musl_optind;
int ret = musl_getopt_long_core(argc, argv, optstring, longopts);
if (resumed > skipped) {
int cnt = musl_optind - resumed;
for (int i = 0; i < cnt; ++i) {
permute(argv, skipped, musl_optind - 1);
}
musl_optind = skipped + cnt;
}
return ret;
} }