Revert r216423 per request from Jilles.
The new behavior prevents us from being able to bail out explicitly on unknown options that we have not implemented. BASH for instance have introduced a '-v' for printf(1) builtin and it seems to be bad to pretend that we supported it and have a script break silently.
This commit is contained in:
parent
e1c9d39ebe
commit
de46de4dd1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=216447
@ -101,7 +101,7 @@ int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
size_t len;
|
||||
int chopped, end, rval;
|
||||
int ch, chopped, end, rval;
|
||||
char *format, *fmt, *start;
|
||||
|
||||
#ifndef SHELL
|
||||
@ -110,15 +110,15 @@ main(int argc, char *argv[])
|
||||
#ifdef SHELL
|
||||
optreset = 1; optind = 1; opterr = 0; /* initialize getopt */
|
||||
#endif
|
||||
/* Skip argv[0] which is the process name */
|
||||
argv++;
|
||||
argc--;
|
||||
|
||||
/* Need to accept/ignore "--" option. */
|
||||
if (argc >= 1 && strcmp(*argv, "--") == 0) {
|
||||
argc--;
|
||||
argv++;
|
||||
while ((ch = getopt(argc, argv, "")) != -1)
|
||||
switch (ch) {
|
||||
case '?':
|
||||
default:
|
||||
usage();
|
||||
return (1);
|
||||
}
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
|
||||
if (argc < 1) {
|
||||
usage();
|
||||
|
Loading…
Reference in New Issue
Block a user