[src/netbsd-1-6]: src/lib/libc/net Pull up revision 1.23 (requested by itojun...

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

details:   https://anonhg.NetBSD.org/src/rev/c110ad26fe64
branches:  netbsd-1-6
changeset: 529011:c110ad26fe64
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Aug 17 15:45:39 2002 +0000

description:
Pull up revision 1.23 (requested by itojun in ticket #694):
eliminate sprintf, use snprintf.  check strlcat error.

diffstat:

 lib/libc/net/getnetnamadr.c |  28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diffs (68 lines):

diff -r ed87809f7df9 -r c110ad26fe64 lib/libc/net/getnetnamadr.c
--- a/lib/libc/net/getnetnamadr.c       Sat Aug 17 15:45:30 2002 +0000
+++ b/lib/libc/net/getnetnamadr.c       Sat Aug 17 15:45:39 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getnetnamadr.c,v 1.20.4.1 2002/06/26 11:11:24 lukem Exp $      */
+/*     $NetBSD: getnetnamadr.c,v 1.20.4.2 2002/08/17 15:45:39 lukem Exp $      */
 
 /* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
  *     Dep. Matematica Universidade de Coimbra, Portugal, Europe
@@ -47,7 +47,7 @@
 static char sccsid_[] = "from getnetnamadr.c   1.4 (Coimbra) 93/06/03";
 static char rcsid[] = "Id: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp ";
 #else
-__RCSID("$NetBSD: getnetnamadr.c,v 1.20.4.1 2002/06/26 11:11:24 lukem Exp $");
+__RCSID("$NetBSD: getnetnamadr.c,v 1.20.4.2 2002/08/17 15:45:39 lukem Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -302,18 +302,19 @@
        default:
                return NS_UNAVAIL;
        case 3:         /* Class A */
-               sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
+               snprintf(qbuf, sizeof(qbuf), "0.0.0.%u.in-addr.arpa", netbr[3]);
                break;
        case 2:         /* Class B */
-               sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
+               snprintf(qbuf, sizeof(qbuf), "0.0.%u.%u.in-addr.arpa",
+                   netbr[3], netbr[2]);
                break;
        case 1:         /* Class C */
-               sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-                   netbr[1]);
+               snprintf(qbuf, sizeof(qbuf), "0.%u.%u.%u.in-addr.arpa",
+                   netbr[3], netbr[2], netbr[1]);
                break;
        case 0:         /* Class D - E */
-               sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-                   netbr[1], netbr[0]);
+               snprintf(qbuf, sizeof(qbuf), "%u.%u.%u.%u.in-addr.arpa",
+                   netbr[3], netbr[2], netbr[1], netbr[0]);
                break;
        }
        anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)(void *)&buf,
@@ -504,17 +505,18 @@
        default:
                return NS_UNAVAIL;
        case 3:         /* Class A */
-               sprintf(qbuf, "%u", netbr[0]);
+               snprintf(qbuf, sizeof(qbuf), "%u", netbr[0]);
                break;
        case 2:         /* Class B */
-               sprintf(qbuf, "%u.%u", netbr[0], netbr[1]);
+               snprintf(qbuf, sizeof(qbuf), "%u.%u", netbr[0], netbr[1]);
                break;
        case 1:         /* Class C */
-               sprintf(qbuf, "%u.%u.%u", netbr[0], netbr[1], netbr[2]);
+               snprintf(qbuf, sizeof(qbuf), "%u.%u.%u", netbr[0], netbr[1],
+                   netbr[2]);
                break;
        case 0:         /* Class D - E */
-               sprintf(qbuf, "%u.%u.%u.%u", netbr[0], netbr[1], netbr[2],
-                   netbr[3]);
+               snprintf(qbuf, sizeof(qbuf), "%u.%u.%u.%u", netbr[0], netbr[1],
+                   netbr[2], netbr[3]);
                break;
        }
        r = yp_match(__ypdomain, "networks.byaddr", qbuf, (int)strlen(qbuf),