[src/trunk]: src/usr.sbin/rip6query socklen_t audit. KNF. signal handler mu...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/edcfad3ec8d1
branches:  trunk
changeset: 536116:edcfad3ec8d1
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun Sep 08 01:40:08 2002 +0000

description:
socklen_t audit.  KNF.  signal handler must use _exit(), not exit().
from deraadt, sync w/kame

diffstat:

 usr.sbin/rip6query/rip6query.c |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r 8191ca3b4676 -r edcfad3ec8d1 usr.sbin/rip6query/rip6query.c
--- a/usr.sbin/rip6query/rip6query.c    Sat Sep 07 23:35:37 2002 +0000
+++ b/usr.sbin/rip6query/rip6query.c    Sun Sep 08 01:40:08 2002 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: rip6query.c,v 1.7 2001/11/16 07:09:37 itojun Exp $     */
-/*     $KAME: rip6query.c,v 1.15 2001/11/16 07:01:21 itojun Exp $      */
+/*     $NetBSD: rip6query.c,v 1.8 2002/09/08 01:40:08 itojun Exp $     */
+/*     $KAME: rip6query.c,v 1.17 2002/09/08 01:35:17 itojun Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -77,7 +77,8 @@
 {
        struct netinfo6 *np;
        struct sockaddr_in6 fsock;
-       int i, n, len, flen;
+       int i, n, len;
+       socklen_t flen;
        int c;
        int ifidx = -1;
        int error;
@@ -151,7 +152,7 @@
        np->rip6_plen = 0;
        np->rip6_metric = HOPCNT_INFINITY6;
        if (sendto(s, ripbuf, RIPSIZE(1), 0, (struct sockaddr *)&sin6,
-                       sizeof(struct sockaddr_in6)) < 0) {
+           sizeof(struct sockaddr_in6)) < 0) {
                err(1, "send");
                /*NOTREACHED*/
        }
@@ -160,19 +161,19 @@
                flen = sizeof(fsock);
                alarm(query_wait);
                if ((len = recvfrom(s, ripbuf, BUFSIZ, 0,
-                               (struct sockaddr *)&fsock, &flen)) < 0) {
+                   (struct sockaddr *)&fsock, &flen)) < 0) {
                        err(1, "recvfrom");
                        /*NOTREACHED*/
                }
                alarm(0);
                printf("Response from %s len %d\n",
-                       sa_n2a((struct sockaddr *)&fsock), len);
+                   sa_n2a((struct sockaddr *)&fsock), len);
                n = (len - sizeof(struct rip6) + sizeof(struct netinfo6)) /
-                       sizeof(struct netinfo6);
+                   sizeof(struct netinfo6);
                np = ripbuf->rip6_nets;
                for (i = 0; i < n; i++, np++) {
                        printf("\t%s/%d [%d]", inet6_n2a(&np->rip6_dest),
-                               np->rip6_plen, np->rip6_metric);
+                           np->rip6_plen, np->rip6_metric);
                        if (np->rip6_tag)
                                printf(" tag=0x%x", ntohs(np->rip6_tag));
                        printf("\n");
@@ -196,7 +197,7 @@
        static char buf[NI_MAXHOST];
 
        if (getnameinfo(sa, sa->sa_len, buf, sizeof(buf),
-                       NULL, 0, NI_NUMERICHOST) != 0) {
+           NULL, 0, NI_NUMERICHOST) != 0) {
                snprintf(buf, sizeof(buf), "%s", "(invalid)");
        }
        return buf;
@@ -216,5 +217,5 @@
        int sig;
 {
 
-       exit(0);
+       _exit(0);
 }