3 files changed, 3 insertions, 6 deletions

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index e3d43249d81..6f45ee00b78 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -63,8 +63,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
         close (fd);                                     \
         return -1;                                      \
       }                                                 \
-    strncpy (pty_name, ptyname, sizeof (pty_name));     \
-    pty_name[sizeof (pty_name) - 1] = 0;                \
+    snprintf (pty_name, sizeof pty_name, "%s", ptyname); \
     sigunblock (sigmask (SIGCHLD));                     \
   }
 
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index bb7a9859b7d..ec45748e03a 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -54,8 +54,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
       { emacs_close (fd); return -1; }          \
     if (!(ptyname = ptsname (fd)))              \
       { emacs_close (fd); return -1; }          \
-    strncpy (pty_name, ptyname, sizeof (pty_name)); \
-    pty_name[sizeof (pty_name) - 1] = 0;        \
+    snprintf (pty_name, sizeof pty_name, "%s", ptyname); \
   }
 
 #define GC_SETJMP_WORKS 1
diff --git a/src/s/unixware.h b/src/s/unixware.h
index e9ebb63f30a..5bda987ffe1 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -40,8 +40,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
       fatal("could not unlock slave pty");      \
     if (!(ptyname = ptsname(fd)))               \
       fatal ("could not enable slave pty");     \
-    strncpy(pty_name, ptyname, sizeof(pty_name)); \
-    pty_name[sizeof(pty_name) - 1] = 0;         \
+    snprintf (pty_name, sizeof pty_name, "%s", ptyname); \
   }
 
 /* Conservative garbage collection has not been tested, so for now