1 files changed, 2 insertions, 8 deletions

diff --git a/src/lib/libc/string/strlcpy.c b/src/lib/libc/string/strlcpy.c
index f282834680..367768928d 100644
--- a/src/lib/libc/string/strlcpy.c
+++ b/src/lib/libc/string/strlcpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strlcpy.c,v 1.14 2016/10/14 18:19:04 dtucker Exp $    */
+/*      $OpenBSD: strlcpy.c,v 1.15 2016/10/16 17:37:39 dtucker Exp $    */
 
 /*
  * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 #include <string.h>
-#include <stdint.h>
 
 /*
  * Copy string src to buffer dst of size dsize.  At most dsize-1
@@ -47,11 +46,6 @@ strlcpy(char *dst, const char *src, size_t dsize)
                         ;
         }
 
-        /*
-         * Cast pointers to unsigned type before calculation, to avoid signed
-         * overflow when the string ends where the MSB has changed.
-         * Return value does not include NUL.
-         */
-        return((uintptr_t)src - (uintptr_t)osrc - 1); 
+        return(src - osrc - 1); /* count does not include NUL */
 }
 DEF_WEAK(strlcpy);