diff options
| author | peter <peter@FreeBSD.org> | 1997-03-11 11:29:42 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-03-11 11:29:42 +0000 |
| commit | e8e23405def4966834a6703435257f5f00ed1ac1 (patch) | |
| tree | dbcfbcbf175d67996919b391d49ba44933521f9e /lib/libc/stdlib | |
| parent | f635e3d3fe547173e7c723038996fbe151718b1d (diff) | |
| parent | e0e06d68d52707cbac25844a417ab6919613e9eb (diff) | |
| download | FreeBSD-src-e8e23405def4966834a6703435257f5f00ed1ac1.zip FreeBSD-src-e8e23405def4966834a6703435257f5f00ed1ac1.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r23658,
which included commits to RCS files with non-trunk default branches.
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 3067e8d..819151e 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 994d757..5dddf86 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 != ':') |
