summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-01-12 19:11:39 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-01-12 19:11:39 +0000
commit1a2571902f64a1603a92d0f28fa002255a416762 (patch)
treed3178d15bf031898115b1cf00996b622dcb52789 /sbin
parentc625e06f8af3b09c772558cd87372998e3886e31 (diff)
repair -f.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ping6/ping6.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 58bb2255b76..cbdefc30ffa 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ping6.c,v 1.25 2001/01/12 19:05:40 itojun Exp $ */
-/* $KAME: ping6.c,v 1.111 2001/01/12 19:04:03 itojun Exp $ */
+/* $OpenBSD: ping6.c,v 1.26 2001/01/12 19:11:38 itojun Exp $ */
+/* $KAME: ping6.c,v 1.112 2001/01/12 19:11:49 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -995,9 +995,7 @@ main(argc, argv)
memset(fdmaskp, 0, fdmasks);
FD_SET(s, fdmaskp);
cc = select(s + 1, fdmaskp, NULL, NULL, tv);
- if ((cc < 0 && errno == EINTR) || (options & F_FLOOD)) {
- if (!signo)
- break;
+ if ((cc < 0 && errno == EINTR) || ((options & F_FLOOD) && signo)) {
if (seenalrm) {
retransmit();
seenalrm = 0;
@@ -1010,6 +1008,7 @@ main(argc, argv)
oninfo(SIGINFO);
seeninfo = 0;
}
+ signo = 0;
continue;
} else if (cc == 0)
continue;