diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1997-03-11 11:29:42 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1997-03-11 11:29:42 +0000 |
| commit | e5493ddb0f25c41b247db685bb6a4af1c64cd57c (patch) | |
| tree | 5048e0b7abece20012200a00d9b7b51c21e1b0da /lib/libc/stdlib | |
| parent | c59376af7a4968518f1ea4a5a7caf56e35a12bab (diff) | |
| parent | 662909a7800d5634772b89ca1509765dda837508 (diff) | |
Notes
Diffstat (limited to 'lib/libc/stdlib')
| -rw-r--r-- | lib/libc/stdlib/atexit.h | 4 | ||||
| -rw-r--r-- | lib/libc/stdlib/getopt.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h index 3067e8dc87e1..819151e2b952 100644 --- a/lib/libc/stdlib/atexit.h +++ b/lib/libc/stdlib/atexit.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)atexit.h 8.1 (Berkeley) 6/4/93 + * @(#)atexit.h 8.2 (Berkeley) 7/3/94 */ /* must be at least 32 to guarantee ANSI conformance */ @@ -42,4 +42,4 @@ struct atexit { void (*fns[ATEXIT_SIZE])(); /* the table itself */ }; -struct atexit *__atexit; /* points to head of LIFO stack */ +extern struct atexit *__atexit; /* points to head of LIFO stack */ diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c index 994d757533e0..5dddf86072a5 100644 --- a/lib/libc/stdlib/getopt.c +++ b/lib/libc/stdlib/getopt.c @@ -32,7 +32,7 @@ */ #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> @@ -67,22 +67,22 @@ getopt(nargc, nargv, ostr) optreset = 0; if (optind >= nargc || *(place = nargv[optind]) != '-') { place = EMSG; - return (EOF); + return (-1); } 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, - * assume it means EOF. + * assume it means -1. */ if (optopt == (int)'-') - return (EOF); + return (-1); if (!*place) ++optind; if (opterr && *ostr != ':') |