d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r216423 per request from Jilles.

Browse Source 
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:
delphij 2010-12-14 20:35:08 +00:00
parent 879b3da6b5
commit 18ea61230f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/printf/printf.c
View File

@ -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();