BSD 4_4_Lite2 release

[unix-history] / usr / src / lib / libc / stdlib / getopt.c

diff --git a/usr/src/lib/libc/stdlib/getopt.c b/usr/src/lib/libc/stdlib/getopt.c
index 994d757..5dddf86 100644 (file)
--- a/usr/src/lib/libc/stdlib/getopt.c
+++ b/usr/src/lib/libc/stdlib/getopt.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)getopt.c   8.2 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)getopt.c   8.3 (Berkeley) 4/27/95";

 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>


@@ -67,22 +67,22 @@ getopt(nargc, nargv, ostr)
                optreset = 0;
                if (optind >= nargc || *(place = nargv[optind]) != '-') {
                        place = EMSG;
                optreset = 0;
                if (optind >= nargc || *(place = nargv[optind]) != '-') {
                        place = EMSG;

-                       return (EOF);
+                       return (-1);

                }
                if (place[1] && *++place == '-') {      /* found "--" */
                        ++optind;
                        place = EMSG;
                }
                if (place[1] && *++place == '-') {      /* found "--" */
                        ++optind;
                        place = EMSG;

-                       return (EOF);
+                       return (-1);

                }
        }                                       /* option letter okay? */
        if ((optopt = (int)*place++) == (int)':' ||
            !(oli = strchr(ostr, optopt))) {
                /*
                 * if the user didn't specify '-' as an option,
                }
        }                                       /* option letter okay? */
        if ((optopt = (int)*place++) == (int)':' ||
            !(oli = strchr(ostr, optopt))) {
                /*
                 * if the user didn't specify '-' as an option,

-                * assume it means EOF.
+                * assume it means -1.

                 */
                if (optopt == (int)'-')
                 */
                if (optopt == (int)'-')

-                       return (EOF);
+                       return (-1);

                if (!*place)
                        ++optind;
                if (opterr && *ostr != ':')
                if (!*place)
                        ++optind;
                if (opterr && *ostr != ':')