[packages/expect.git] / expect-pty.patch

--- expect-5.26/pty_termios.c	Mon Mar 16 19:53:41 1998
+++ expect-5.26.orig/pty_termios.c	Thu Oct  8 09:51:36 1998
@@ -131,7 +131,11 @@
 #endif
 
 #if defined(HAVE__GETPTY) || defined(HAVE_PTC_PTS) || defined(HAVE_PTMX)
+# if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
+#include <expect.h>
+#else
 static char *slave_name;
+# endif /* GNU libc-2.1 */
 #endif
 
 #if defined(HAVE_GETPTY)
@@ -369,7 +373,7 @@
 #else
 	if ((master = open("/dev/ptmx", O_RDWR)) == -1) return(-1);
 #endif
-	if ((slave_name = (char *)ptsname(master)) == NULL) {
+	if (slave_name ==  NULL) {
 		close(master);
 		return(-1);
 	} else if (grantpt(master)) {
Commit	Line	Data
3d998d6a	1	--- expect-5.26/pty_termios.c Mon Mar 16 19:53:41 1998
	2	+++ expect-5.26.orig/pty_termios.c Thu Oct 8 09:51:36 1998
	3	@@ -131,7 +131,11 @@
	4	#endif
	5
	6	#if defined(HAVE__GETPTY) \|\| defined(HAVE_PTC_PTS) \|\| defined(HAVE_PTMX)
	7	+# if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
	8	+#include <expect.h>
	9	+#else
	10	static char *slave_name;
	11	+# endif /* GNU libc-2.1 */
	12	#endif
	13
	14	#if defined(HAVE_GETPTY)
	15	@@ -369,7 +373,7 @@
	16	#else
	17	if ((master = open("/dev/ptmx", O_RDWR)) == -1) return(-1);
	18	#endif
8fad8086	19	- if ((slave_name = (char *)ptsname(master)) == NULL) {
8fad8086	20	+ if (slave_name == NULL) {
3d998d6a	21	close(master);
	22	return(-1);
	23	} else if (grantpt(master)) {