Get rid of an extra newline.

[tcpdump] / missing / getnameinfo.c

diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index d525f4554ab691739d0cc037b2eb936be2942a97..d5e06391d8d20f1d5b6d4c84642ca1bbf3c0819d 100644 (file)
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.6 2000-01-21 04:06:19 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.8 2000-10-24 00:56:53 fenner Exp $";
 #endif
 
 #include <sys/types.h>
@@ -58,10 +58,6 @@ static const char rcsid[] =
 #include <stddef.h>
 #include <errno.h>
 
-#ifndef HAVE_PORTABLE_PROTOTYPE
-#include "cdecl_ext.h"
-#endif 
-
 #ifdef NEED_ADDRINFO_H
 #include "addrinfo.h"
 #endif
@@ -159,12 +155,12 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                                (flags & NI_DGRAM) ? "udp" : "tcp");
                }
                if (sp) {
-                       if (strlen(sp->s_name) > servlen)
+                       if (strlen(sp->s_name) + 1 > servlen)
                                return ENI_MEMORY;
                        strcpy(serv, sp->s_name);
                } else {
                        snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
-                       if (strlen(numserv) > servlen)
+                       if (strlen(numserv) + 1 > servlen)
                                return ENI_MEMORY;
                        strcpy(serv, numserv);
                }
@@ -220,7 +216,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
                    == NULL)
                        return ENI_SYSTEM;
-               if (strlen(numaddr) > hostlen)
+               if (strlen(numaddr) + 1 > hostlen)
                        return ENI_MEMORY;
                strcpy(host, numaddr);
 #if defined(INET6) && defined(NI_WITHSCOPEID)
@@ -260,7 +256,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                                p = strchr(hp->h_name, '.');
                                if (p) *p = '\0';
                        }
-                       if (strlen(hp->h_name) > hostlen) {
+                       if (strlen(hp->h_name) + 1 > hostlen) {
 #ifdef USE_GETIPNODEBY
                                freehostent(hp);
 #endif
@@ -276,7 +272,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                        if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
                            == NULL)
                                return ENI_NOHOSTNAME;
-                       if (strlen(numaddr) > hostlen)
+                       if (strlen(numaddr) + 1 > hostlen)
                                return ENI_MEMORY;
                        strcpy(host, numaddr);
                }