# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1295112246 0
# Node ID 9dd4559b9e9a51a538fb17bcb72502dec8ff6e64
# Parent  ba62563ec7c707a37b3032a29ac6e3c3d60b85bc
Try again, s/usg5-4.h, this type with qxestrcpy_ascii(), etc.

2011-01-15  Aidan Kehoe  <kehoea@parhasard.net>

	* s/usg5-4.h (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF):
	That didn't work; attempt with qxestrcpy_ascii(),
	qxestrncpy_ascii().

diff -r ba62563ec7c7 -r 9dd4559b9e9a src/ChangeLog
--- a/src/ChangeLog	Sat Jan 15 15:45:46 2011 +0000
+++ b/src/ChangeLog	Sat Jan 15 17:24:06 2011 +0000
@@ -1,3 +1,9 @@
+2011-01-15  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* s/usg5-4.h (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF):
+	That didn't work; attempt with qxestrcpy_ascii(),
+	qxestrncpy_ascii().
+
 2011-01-14  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* s/hpux11.h (PTY_TTY_NAME_SPRINTF, PTY_NAME_SPRINTF):
diff -r ba62563ec7c7 -r 9dd4559b9e9a src/s/usg5-4.h
--- a/src/s/usg5-4.h	Sat Jan 15 15:45:46 2011 +0000
+++ b/src/s/usg5-4.h	Sat Jan 15 17:24:06 2011 +0000
@@ -124,7 +124,7 @@
 
 /* This sets the name of the master side of the PTY. */
 
-#define PTY_NAME_SPRINTF qxestrcpy (pty_name, "/dev/ptmx");
+#define PTY_NAME_SPRINTF qxestrcpy_ascii (pty_name, "/dev/ptmx");
 
 /* This sets the name of the slave side of the PTY.  On SysVr4,
    grantpt(3) forks a subprocess, so keep sigchld_handler() from
@@ -150,7 +150,8 @@
       { close (fd); return -1; }			\
     if (!(ptyname = ptsname (fd)))			\
       { close (fd); return -1; }			\
-    qxestrncpy (pty_name, ptyname, sizeof (pty_name));	\
+    qxestrncpy_ascii (pty_name, ptyname,		\
+		      sizeof (pty_name));		\
     pty_name[sizeof (pty_name) - 1] = 0;		\
   }