Rename all functions imported from musl

This is to avoid conflicting with libraries, which occurred in the mingw builds
This commit is contained in:
ISSOtm
2019-11-23 23:07:39 +01:00
parent 68410d35d3
commit d93ad2e650
6 changed files with 19 additions and 19 deletions

View File

@@ -36,7 +36,7 @@ struct option {
int val; int val;
}; };
int getopt_long_only(int, char **, const char *, const struct option *, int *); int musl_getopt_long_only(int, char **, const char *, const struct option *, int *);
#define no_argument 0 #define no_argument 0
#define required_argument 1 #define required_argument 1

View File

@@ -317,8 +317,8 @@ int main(int argc, char *argv[])
newopt = CurrentOptions; newopt = CurrentOptions;
while ((ch = getopt_long_only(argc, argv, optstring, longopts, while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) { NULL)) != -1) {
switch (ch) { switch (ch) {
case 'b': case 'b':
if (strlen(optarg) == 2) { if (strlen(optarg) == 2) {

20
src/extern/getopt.c vendored
View File

@@ -33,7 +33,7 @@
int __optpos, __optreset; int __optpos, __optreset;
void __getopt_msg(const char *a, const char *b, const char *c, size_t l) void musl__getopt_msg(const char *a, const char *b, const char *c, size_t l)
{ {
FILE *f = stderr; FILE *f = stderr;
(void)(fputs(a, f)>=0 (void)(fputs(a, f)>=0
@@ -52,9 +52,9 @@ static void permute(char **argv, int dest, int src)
av[dest] = tmp; av[dest] = tmp;
} }
static int __getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly); static int musl__getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly);
static int __getopt_long(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly) static int musl__getopt_long(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
{ {
int ret, skipped, resumed; int ret, skipped, resumed;
if (!optind || __optreset) { if (!optind || __optreset) {
@@ -73,7 +73,7 @@ static int __getopt_long(int argc, char **argv, const char *optstring, const str
optind = i; optind = i;
} }
resumed = optind; resumed = optind;
ret = __getopt_long_core(argc, argv, optstring, longopts, idx, longonly); ret = musl__getopt_long_core(argc, argv, optstring, longopts, idx, longonly);
if (resumed > skipped) { if (resumed > skipped) {
int i, cnt = optind-resumed; int i, cnt = optind-resumed;
for (i=0; i<cnt; i++) for (i=0; i<cnt; i++)
@@ -83,7 +83,7 @@ static int __getopt_long(int argc, char **argv, const char *optstring, const str
return ret; return ret;
} }
static int __getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly) static int musl__getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
{ {
optarg = 0; optarg = 0;
if (longopts && argv[optind][0] == '-' && if (longopts && argv[optind][0] == '-' &&
@@ -128,7 +128,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
optopt = longopts[i].val; optopt = longopts[i].val;
if (colon || !opterr) if (colon || !opterr)
return '?'; return '?';
__getopt_msg(argv[0], musl__getopt_msg(argv[0],
": option does not take an argument: ", ": option does not take an argument: ",
longopts[i].name, longopts[i].name,
strlen(longopts[i].name)); strlen(longopts[i].name));
@@ -140,7 +140,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
optopt = longopts[i].val; optopt = longopts[i].val;
if (colon) return ':'; if (colon) return ':';
if (!opterr) return '?'; if (!opterr) return '?';
__getopt_msg(argv[0], musl__getopt_msg(argv[0],
": option requires an argument: ", ": option requires an argument: ",
longopts[i].name, longopts[i].name,
strlen(longopts[i].name)); strlen(longopts[i].name));
@@ -158,7 +158,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
if (argv[optind][1] == '-') { if (argv[optind][1] == '-') {
optopt = 0; optopt = 0;
if (!colon && opterr) if (!colon && opterr)
__getopt_msg(argv[0], cnt ? musl__getopt_msg(argv[0], cnt ?
": option is ambiguous: " : ": option is ambiguous: " :
": unrecognized option: ", ": unrecognized option: ",
argv[optind]+2, argv[optind]+2,
@@ -170,7 +170,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
return getopt(argc, argv, optstring); return getopt(argc, argv, optstring);
} }
int getopt_long_only(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx) int musl_getopt_long_only(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx)
{ {
return __getopt_long(argc, argv, optstring, longopts, idx, 1); return musl__getopt_long(argc, argv, optstring, longopts, idx, 1);
} }

View File

@@ -98,8 +98,8 @@ int main(int argc, char *argv[])
int version = 0; /* mask ROM version number */ int version = 0; /* mask ROM version number */
int padvalue = 0; /* to pad the rom with if it changes size */ int padvalue = 0; /* to pad the rom with if it changes size */
while ((ch = getopt_long_only(argc, argv, optstring, longopts, while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) { NULL)) != -1) {
switch (ch) { switch (ch) {
case 'C': case 'C':
coloronly = true; coloronly = true;

View File

@@ -80,8 +80,8 @@ int main(int argc, char *argv[])
depth = 2; depth = 2;
while ((ch = getopt_long_only(argc, argv, optstring, longopts, while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) { NULL)) != -1) {
switch (ch) { switch (ch) {
case 'A': case 'A':
opts.attrmapout = true; opts.attrmapout = true;

View File

@@ -102,8 +102,8 @@ int main(int argc, char *argv[])
unsigned long value; /* For storing `strtoul`'s return value */ unsigned long value; /* For storing `strtoul`'s return value */
/* Parse options */ /* Parse options */
while ((optionChar = getopt_long_only(argc, argv, optstring, longopts, while ((optionChar = musl_getopt_long_only(argc, argv, optstring,
NULL)) != -1) { longopts, NULL)) != -1) {
switch (optionChar) { switch (optionChar) {
case 'd': case 'd':
isDmgMode = true; isDmgMode = true;