use strlcpy vs strncpy+a[len-1]='\0'. millert@ ok.

14 files changed, 47 insertions, 68 deletions

diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
index 8fd319a4f3..d1a342c178 100644
--- a/src/lib/libc/crypt/crypt.c
+++ b/src/lib/libc/crypt/crypt.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: crypt.c,v 1.13 1998/03/22 19:01:18 niklas Exp $       */
+/*      $OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $        */
 
 /*
  * FreeSec: libcrypt
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crypt.c,v 1.13 1998/03/22 19:01:18 niklas Exp $";
+static char rcsid[] = "$OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -650,7 +650,7 @@ crypt(key, setting)
                         if (des_setkey((u_char *) keybuf))
                                 return(NULL);
                 }
-                strncpy((char *)output, setting, 9);
+                strlcpy((char *)output, setting, 10);
 
                 /*
                  * Double check that we weren't given a short setting.
@@ -659,7 +659,6 @@ crypt(key, setting)
                  * Just make sure the output string doesn't have an extra
                  * NUL in it.
                  */
-                output[9] = '\0';
                 p = output + strlen((const char *)output);
         } else {
                 /*
diff --git a/src/lib/libc/net/ethers.c b/src/lib/libc/net/ethers.c
index 1124e43253..2c8328a9ba 100644
--- a/src/lib/libc/net/ethers.c
+++ b/src/lib/libc/net/ethers.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ethers.c,v 1.11 2000/08/22 19:04:41 deraadt Exp $     */
+/*      $OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $       */
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ethers.c,v 1.11 2000/08/22 19:04:41 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -263,8 +263,7 @@ ether_line(line, e, hostname)
         n = strcspn(p, " \t\n");
         if (n >= MAXHOSTNAMELEN)
                 goto bad;
-        (void)strncpy(hostname, p, n);
-        hostname[n] = '\0';
+        strlcpy(hostname, p, n + 1);
         return (0);
 
 bad:
diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index 0a0b112589..cc313c5c6a 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getaddrinfo.c,v 1.28 2001/06/11 10:05:58 itojun Exp $ */
+/*      $OpenBSD: getaddrinfo.c,v 1.29 2001/06/27 00:58:54 lebel Exp $  */
 /*      $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $    */
 
 /*
@@ -1797,8 +1797,7 @@ res_querydomainN(name, domain, target)
                         return (-1);
                 }
                 if (n > 0 && name[--n] == '.') {
-                        strncpy(nbuf, name, n);
-                        nbuf[n] = '\0';
+                        strlcpy(nbuf, name, n + 1);
                 } else
                         longname = name;
         } else {
diff --git a/src/lib/libc/net/gethostnamadr.c b/src/lib/libc/net/gethostnamadr.c
index 33c9643f70..d7d6c621cf 100644
--- a/src/lib/libc/net/gethostnamadr.c
+++ b/src/lib/libc/net/gethostnamadr.c
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.42 2000/07/30 14:07:14 itojun Exp $";
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.43 2001/06/27 00:58:55 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -574,8 +574,7 @@ gethostbyname2(name, af)
                                         h_errno = HOST_NOT_FOUND;
                                         return (NULL);
                                 }
-                                strncpy(hostbuf, name, MAXHOSTNAMELEN-1);
-                                hostbuf[MAXHOSTNAMELEN-1] = '\0';
+                                strlcpy(hostbuf, name, MAXHOSTNAMELEN);
                                 bp = hostbuf + MAXHOSTNAMELEN;
                                 len = sizeof hostbuf - MAXHOSTNAMELEN;
                                 host.h_name = hostbuf;
@@ -607,8 +606,7 @@ gethostbyname2(name, af)
                                         h_errno = HOST_NOT_FOUND;
                                         return (NULL);
                                 }
-                                strncpy(hostbuf, name, MAXHOSTNAMELEN-1);
-                                hostbuf[MAXHOSTNAMELEN-1] = '\0';
+                                strlcpy(hostbuf, name, MAXHOSTNAMELEN);
                                 bp = hostbuf + MAXHOSTNAMELEN;
                                 len = sizeof hostbuf - MAXHOSTNAMELEN;
                                 host.h_name = hostbuf;
diff --git a/src/lib/libc/net/getifaddrs.c b/src/lib/libc/net/getifaddrs.c
index 29348cd492..5be334cb6c 100644
--- a/src/lib/libc/net/getifaddrs.c
+++ b/src/lib/libc/net/getifaddrs.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getifaddrs.c,v 1.3 2000/11/24 08:26:47 itojun Exp $   */
+/*      $OpenBSD: getifaddrs.c,v 1.4 2001/06/27 00:58:55 lebel Exp $    */
 
 /*
  * Copyright (c) 1995, 1999
@@ -353,8 +353,7 @@ getifaddrs(struct ifaddrs **pif)
                 struct sockaddr *sa;
 
                 ift->ifa_name = names;
-                names[sizeof(ifr->ifr_name)] = 0;
-                strncpy(names, ifr->ifr_name, sizeof(ifr->ifr_name));
+                strlcpy(names, ifr->ifr_name, sizeof(ifr->ifr_name));
                 while (*names++)
                         ;
 
diff --git a/src/lib/libc/net/getnetnamadr.c b/src/lib/libc/net/getnetnamadr.c
index 0ebc77b656..f755cd9b14 100644
--- a/src/lib/libc/net/getnetnamadr.c
+++ b/src/lib/libc/net/getnetnamadr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getnetnamadr.c,v 1.13 1999/06/04 06:38:10 niklas Exp $        */
+/*      $OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel Exp $ */
 
 /*
  * Copyright (c) 1997, Jason Downs.  All rights reserved.
@@ -77,7 +77,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c	8.1 (Berkeley) 6/4/93";
 static char sccsid_[] = "from getnetnamadr.c    1.4 (Coimbra) 93/06/03";
 static char rcsid[] = "$From: getnetnamadr.c,v 8.7 1996/08/05 08:31:35 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.13 1999/06/04 06:38:10 niklas Exp $";
+static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -184,8 +184,7 @@ getnetanswer(answer, anslen, net_i)
                         break;
                 cp += n;
                 ans[0] = '\0';
-                (void)strncpy(&ans[0], bp, sizeof ans-1);
-                ans[sizeof ans-1] = '\0';
+                strlcpy(&ans[0], bp, sizeof ans);
                 GETSHORT(type, cp);
                 GETSHORT(class, cp);
                 cp += INT32SZ;          /* TTL */
@@ -226,10 +225,9 @@ getnetanswer(answer, anslen, net_i)
                                         ;
                                 if (nchar != 1 || *in != '0' || flag) {
                                         flag = 1;
-                                        (void)strncpy(paux1,
-                                                      (i==0) ? in : in-1,
-                                                      (i==0) ?nchar : nchar+1);
-                                        paux1[(i==0) ? nchar : nchar+1] = '\0';
+                                        strlcpy(paux1, 
+                                                (i==0) ? in : in-1, 
+                                                (i==0) ? nchar+1 : nchar+2);
                                         pauxt = paux2;
                                         paux2 = strcat(paux1, paux2);
                                         paux1 = pauxt;
@@ -358,8 +356,7 @@ getnetbyname(net)
                         break;
 #endif  /* YP */
                 case 'b':
-                        strncpy(qbuf, net, sizeof qbuf-1);
-                        qbuf[sizeof qbuf-1] = '\0';
+                        strlcpy(qbuf, net, sizeof qbuf);
                         anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf,
                             sizeof(buf));
                         if (anslen < 0) {
diff --git a/src/lib/libc/net/ipx_addr.c b/src/lib/libc/net/ipx_addr.c
index 9c9fe651cd..0d225e281b 100644
--- a/src/lib/libc/net/ipx_addr.c
+++ b/src/lib/libc/net/ipx_addr.c
@@ -37,7 +37,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ipx_addr.c,v 1.4 2001/01/04 21:45:30 todd Exp $";
+static char rcsid[] = "$OpenBSD: ipx_addr.c,v 1.5 2001/06/27 00:58:55 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -57,8 +57,7 @@ ipx_addr(name)
         char *hostname, *socketname, *cp;
         char buf[50];
 
-        (void)strncpy(buf, name, sizeof(buf) - 1);
-        buf[sizeof(buf) - 1] = '\0';
+        strlcpy(buf, name, sizeof(buf));
 
         /*
          * First, figure out what he intends as a field separtor.
diff --git a/src/lib/libc/net/ns_addr.c b/src/lib/libc/net/ns_addr.c
index e44ac21195..7dcc988afe 100644
--- a/src/lib/libc/net/ns_addr.c
+++ b/src/lib/libc/net/ns_addr.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.5 2001/01/04 21:45:31 todd Exp $";
+static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.6 2001/06/27 00:58:55 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -56,8 +56,7 @@ ns_addr(name)
         char *hostname, *socketname, *cp;
         char buf[50];
 
-        (void)strncpy(buf, name, sizeof(buf) - 1);
-        buf[sizeof(buf) - 1] = '\0';
+        strlcpy(buf, name, sizeof(buf));
 
         /*
          * First, figure out what he intends as a field separtor.
diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
index 2ad3530c87..1439fff061 100644
--- a/src/lib/libc/net/rcmd.c
+++ b/src/lib/libc/net/rcmd.c
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rcmd.c,v 1.37 2001/02/10 21:55:07 millert Exp $";
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.38 2001/06/27 00:58:55 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -125,8 +125,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
                 return (-1);
         }
         if (res->ai_canonname) {
-                strncpy(hbuf, res->ai_canonname, sizeof(hbuf) - 1);
-                hbuf[sizeof(hbuf) - 1] = '\0';
+                strlcpy(hbuf, res->ai_canonname, sizeof(hbuf));
                 *ahost = hbuf;
         } else
                 ; /*XXX*/
diff --git a/src/lib/libc/net/res_init.c b/src/lib/libc/net/res_init.c
index c44539604a..5134323f4e 100644
--- a/src/lib/libc/net/res_init.c
+++ b/src/lib/libc/net/res_init.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_init.c,v 1.21 2001/06/11 10:06:00 itojun Exp $    */
+/*      $OpenBSD: res_init.c,v 1.22 2001/06/27 00:58:55 lebel Exp $     */
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -64,7 +64,7 @@
 static char sccsid[] = "@(#)res_init.c  8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.21 2001/06/11 10:06:00 itojun Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.22 2001/06/27 00:58:55 lebel Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -215,8 +215,7 @@ res_init()
 
         /* Allow user to override the local domain definition */
         if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) {
-                (void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-                _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+                strlcpy(_res.defdname, cp, sizeof(_res.defdname));
                 haveenv++;
 
                 /*
@@ -278,8 +277,7 @@ res_init()
                             cp++;
                     if ((*cp == '\0') || (*cp == '\n'))
                             continue;
-                    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-                    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+                    strlcpy(_res.defdname, cp, sizeof(_res.defdname));
                     if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
                             *cp = '\0';
                     havesearch = 0;
@@ -321,8 +319,7 @@ res_init()
                             cp++;
                     if ((*cp == '\0') || (*cp == '\n'))
                             continue;
-                    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-                    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+                    strlcpy(_res.defdname, cp, sizeof(_res.defdname));
                     if ((cp = strchr(_res.defdname, '\n')) != NULL)
                             *cp = '\0';
                     /*
@@ -520,9 +517,8 @@ res_init()
             gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
             (cp = strchr(buf, '.')) != NULL)
         {
-                strncpy(_res.defdname, cp + 1,
-                        sizeof(_res.defdname) - 1);
-                _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+                strlcpy(_res.defdname, cp + 1,
+                        sizeof(_res.defdname));
         }
 
         /* find components of local domain that might be searched */
diff --git a/src/lib/libc/net/res_query.c b/src/lib/libc/net/res_query.c
index 433e80f648..db76821fc6 100644
--- a/src/lib/libc/net/res_query.c
+++ b/src/lib/libc/net/res_query.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_query.c,v 1.14 2001/06/11 10:06:01 itojun Exp $   */
+/*      $OpenBSD: res_query.c,v 1.15 2001/06/27 00:58:55 lebel Exp $    */
 
 /*
  * ++Copyright++ 1988, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_query.c,v 8.9 1996/09/22 00:13:28 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_query.c,v 1.14 2001/06/11 10:06:01 itojun Exp $";
+static char rcsid[] = "$OpenBSD: res_query.c,v 1.15 2001/06/27 00:58:55 lebel Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -390,8 +390,8 @@ hostalias(name)
                                 break;
                         for (cp2 = cp1 + 1; *cp2 && !isspace(*cp2); ++cp2)
                                 ;
-                        strncpy(abuf, cp1, sizeof(abuf) - 1);
-                        abuf[sizeof(abuf) - 1] = *cp2 = '\0';
+                        *cp2 = '\0';
+                        strlcpy(abuf, cp1, sizeof(abuf));
                         fclose(fp);
                         return (abuf);
                 }
diff --git a/src/lib/libc/stdlib/realpath.c b/src/lib/libc/stdlib/realpath.c
index 0288601464..a6195c1dcb 100644
--- a/src/lib/libc/stdlib/realpath.c
+++ b/src/lib/libc/stdlib/realpath.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: realpath.c,v 1.4 1998/05/18 09:55:19 deraadt Exp $";
+static char *rcsid = "$OpenBSD: realpath.c,v 1.5 2001/06/27 00:58:56 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -78,8 +78,7 @@ realpath(path, resolved)
          *     if it is a directory, then change to that directory.
          * get the current directory name and append the basename.
          */
-        (void)strncpy(resolved, path, MAXPATHLEN - 1);
-        resolved[MAXPATHLEN - 1] = '\0';
+        strlcpy(resolved, path, MAXPATHLEN);
 loop:
         q = strrchr(resolved, '/');
         if (q != NULL) {
diff --git a/src/lib/libc/string/__strerror.c b/src/lib/libc/string/__strerror.c
index 9c023f8a53..04fdce580a 100644
--- a/src/lib/libc/string/__strerror.c
+++ b/src/lib/libc/string/__strerror.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: __strerror.c,v 1.6 1996/09/25 08:17:30 deraadt Exp $";
+static char *rcsid = "$OpenBSD: __strerror.c,v 1.7 2001/06/27 00:58:56 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef NLS
@@ -87,16 +87,14 @@ __strerror(num, buf)
         errnum = num;                           /* convert to unsigned */
         if (errnum < sys_nerr) {
 #ifdef NLS
-                strncpy(buf, catgets(catd, 1, errnum,
-                    (char *)sys_errlist[errnum]), NL_TEXTMAX-1);
-                buf[NL_TEXTMAX - 1] = '\0';
+                strlcpy(buf, catgets(catd, 1, errnum,
+                    (char *)sys_errlist[errnum]), NL_TEXTMAX);
 #else
                 return(sys_errlist[errnum]);
 #endif
         } else {
 #ifdef NLS
-                strncpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX-1);
-                buf[NL_TEXTMAX - 1] = '\0';
+                strlcpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX);
 #else
                 strcpy(buf, UPREFIX);
 #endif
diff --git a/src/lib/libc/string/__strsignal.c b/src/lib/libc/string/__strsignal.c
index ae0df72cd3..4ca5bad3c0 100644
--- a/src/lib/libc/string/__strsignal.c
+++ b/src/lib/libc/string/__strsignal.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: __strsignal.c,v 1.5 1996/09/25 13:19:01 deraadt Exp $";
+static char *rcsid = "$OpenBSD: __strsignal.c,v 1.6 2001/06/27 00:58:56 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef NLS
@@ -80,16 +80,14 @@ __strsignal(num, buf)
         signum = num;                           /* convert to unsigned */
         if (signum < NSIG) {
 #ifdef NLS
-                strncpy(buf, catgets(catd, 2, signum,
-                    (char *)sys_siglist[signum]), NL_TEXTMAX-1);
-                buf[NL_TEXTMAX-1] = '\0';
+                strlcpy(buf, catgets(catd, 2, signum,
+                    (char *)sys_siglist[signum]), NL_TEXTMAX);
 #else
                 return((char *)sys_siglist[signum]);
 #endif
         } else {
 #ifdef NLS
-                strncpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX-1);
-                buf[NL_TEXTMAX-1] = '\0';
+                strlcpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX);
 #else
                 strcpy(buf, UPREFIX);
 #endif