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

Make egetopt() return -1 not EOF, as getopt(3) do.

Browse Source 
Reviewed by:markm
This commit is contained in:
charnier 2002-06-23 20:42:30 +00:00
parent 99a72e8b2b
commit 136d95b38a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/pr/egetopt.c
View File

@ -93,7 +93,7 @@ egetopt(int nargc, char * const *nargv, const char *ostr)
if ((eoptind >= nargc) ||
((*(place = nargv[eoptind]) != '-') && (*place != '+'))) {
place = emsg;
return (EOF);
return (-1);
}
delim = (int)*place;
@ -103,7 +103,7 @@ egetopt(int nargc, char * const *nargv, const char *ostr)
*/
++eoptind;
place = emsg;
return (EOF);
return (-1);
}
}
@ -114,10 +114,10 @@ egetopt(int nargc, char * const *nargv, const char *ostr)
!(oli = strchr(ostr, eoptopt))) {
/*
* if the user didn't specify '-' as an option,
* assume it means EOF when by itself.
* assume it means -1 when by itself.
*/
if ((eoptopt == (int)'-') && !*place)
return (EOF);
return (-1);
if (strchr(ostr, '#') && (isdigit(eoptopt) ||
(((eoptopt == (int)'-') || (eoptopt == (int)'+')) &&
isdigit(*place)))) {