svn commit: r288960 - head/usr.sbin/watch

Xin LI delphij at FreeBSD.org
Tue Oct 6 22:49:27 UTC 2015


Author: delphij
Date: Tue Oct  6 22:49:25 2015
New Revision: 288960
URL: https://svnweb.freebsd.org/changeset/base/288960

Log:
  Use strlcpy() when the string is expected to be nul-terminated.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/watch/watch.c

Modified: head/usr.sbin/watch/watch.c
==============================================================================
--- head/usr.sbin/watch/watch.c	Tue Oct  6 22:45:23 2015	(r288959)
+++ head/usr.sbin/watch/watch.c	Tue Oct  6 22:49:25 2015	(r288960)
@@ -247,7 +247,7 @@ set_dev(const char *name)
 	if ((sb.st_mode & S_IFMT) != S_IFCHR)
 		fatal(EX_DATAERR, "must be a character device");
 
-	strncpy(dev_name, buf, DEV_NAME_LEN);
+	strlcpy(dev_name, buf, sizeof(dev_name));
 
 	attach_snp();
 }
@@ -340,7 +340,7 @@ main(int ac, char *av[])
 		else
 			fatal(EX_DATAERR, "no device name given");
 	} else
-		strncpy(dev_name, *av, DEV_NAME_LEN);
+		strlcpy(dev_name, *av, sizeof(dev_name));
 
 	set_dev(dev_name);
 


More information about the svn-src-all mailing list