diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-06-20 20:00:04 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-06-20 20:00:04 +0000 |
| commit | 5a4314a720c2f9c55c3e7779cc60f920db4082df (patch) | |
| tree | 6c947cf4a5a604a42bdbefea1b546c8f8c2321d0 | |
| parent | a07458e6c8119f64993ed0e21eb8acee0885f255 (diff) | |
pedant; getopt(3) returns -1 instead of EOF. from aaron
| -rw-r--r-- | sbin/ping6/Makefile | 4 | ||||
| -rw-r--r-- | sbin/ping6/ping6.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile index fe828e47993..4f4b63a6031 100644 --- a/sbin/ping6/Makefile +++ b/sbin/ping6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/03/23 11:26:17 hugh Exp $ +# $OpenBSD: Makefile,v 1.4 2000/06/20 20:00:03 itojun Exp $ PROG= ping6 MAN= ping6.8 @@ -12,8 +12,6 @@ BINOWN= root BINGRP= bin BINMODE=4555 -CPPFLAGS+=-DNRL_GETADDRINFO - # kame scopeid hack CPPFLAGS+=-DKAME_SCOPEID diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 1c597656091..d8bc8cd27b9 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping6.c,v 1.7 2000/06/12 17:24:27 itojun Exp $ */ +/* $OpenBSD: ping6.c,v 1.8 2000/06/20 20:00:03 itojun Exp $ */ /* $KAME: ping6.c,v 1.55 2000/06/12 16:18:32 itojun Exp $ */ /* @@ -292,12 +292,12 @@ main(argc, argv) preload = 0; datap = &outpack[ICMP6ECHOLEN + ICMP6ECHOTMLEN]; #ifndef IPSEC - while ((ch = getopt(argc, argv, "a:b:c:dfHh:I:i:l:nNp:qRS:s:vwW")) != EOF) + while ((ch = getopt(argc, argv, "a:b:c:dfHh:I:i:l:nNp:qRS:s:vwW")) != -1) #else #ifdef IPSEC_POLICY_IPSEC - while ((ch = getopt(argc, argv, "a:b:c:dfHh:I:i:l:nNp:qRS:s:vwWP:")) != EOF) + while ((ch = getopt(argc, argv, "a:b:c:dfHh:I:i:l:nNp:qRS:s:vwWP:")) != -1) #else - while ((ch = getopt(argc, argv, "a:b:c:dfHh:I:i:l:nNp:qRS:s:vwWAE")) != EOF) + while ((ch = getopt(argc, argv, "a:b:c:dfHh:I:i:l:nNp:qRS:s:vwWAE")) != -1) #endif /*IPSEC_POLICY_IPSEC*/ #endif { |