projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert ioctl time64 fallbacks to table-driven framework
[musl]
/
src
/
misc
/
getopt.c
diff --git
a/src/misc/getopt.c
b/src/misc/getopt.c
index
e921a60
..
c3f6699
100644
(file)
--- a/
src/misc/getopt.c
+++ b/
src/misc/getopt.c
@@
-1,10
+1,11
@@
+#define _BSD_SOURCE
#include <unistd.h>
#include <wchar.h>
#include <string.h>
#include <limits.h>
#include <stdlib.h>
#include <unistd.h>
#include <wchar.h>
#include <string.h>
#include <limits.h>
#include <stdlib.h>
-#include "libc.h"
#include "locale_impl.h"
#include "locale_impl.h"
+#include "stdio_impl.h"
char *optarg;
int optind=1, opterr=1, optopt, __optpos, __optreset=0;
char *optarg;
int optind=1, opterr=1, optopt, __optpos, __optreset=0;
@@
-16,12
+17,12
@@
void __getopt_msg(const char *a, const char *b, const char *c, size_t l)
{
FILE *f = stderr;
b = __lctrans_cur(b);
{
FILE *f = stderr;
b = __lctrans_cur(b);
-
flockfile
(f);
+
FLOCK
(f);
fputs(a, f)>=0
&& fwrite(b, strlen(b), 1, f)
&& fwrite(c, 1, l, f)==l
&& putc('\n', f);
fputs(a, f)>=0
&& fwrite(b, strlen(b), 1, f)
&& fwrite(c, 1, l, f)==l
&& putc('\n', f);
-
funlockfile
(f);
+
FUNLOCK
(f);
}
int getopt(int argc, char * const argv[], const char *optstring)
}
int getopt(int argc, char * const argv[], const char *optstring)
@@
-84,8
+85,12
@@
int getopt(int argc, char * const argv[], const char *optstring)
return '?';
}
if (optstring[i] == ':') {
return '?';
}
if (optstring[i] == ':') {
- if (optstring[i+1] == ':') optarg = 0;
- else if (optind >= argc) {
+ optarg = 0;
+ if (optstring[i+1] != ':' || optpos) {
+ optarg = argv[optind++] + optpos;
+ optpos = 0;
+ }
+ if (optind > argc) {
optopt = c;
if (optstring[0] == ':') return ':';
if (opterr) __getopt_msg(argv[0],
optopt = c;
if (optstring[0] == ':') return ':';
if (opterr) __getopt_msg(argv[0],
@@
-93,10
+98,6
@@
int getopt(int argc, char * const argv[], const char *optstring)
optchar, k);
return '?';
}
optchar, k);
return '?';
}
- if (optstring[i+1] != ':' || optpos) {
- optarg = argv[optind++] + optpos;
- optpos = 0;
- }
}
return c;
}
}
return c;
}