Thu Jul 12 10:14:50 2012 UTC ()

Revert local patch adding a call to openpty.
Defining HAS_OPENPTY (which I just added in the crossover Makefile)
has the same effect.


(wiz)

diff -r1.3 -r1.4 xsrc/external/mit/xconsole/dist/xconsole.c

--- xsrc/external/mit/xconsole/dist/xconsole.c 2010/11/21 01:19:29	1.3
+++ xsrc/external/mit/xconsole/dist/xconsole.c 2012/07/12 10:14:50	1.4

 @@ -902,56 +902,52 @@ get_pty(int *pty, int *tty, char *ttydev
+	    }
 	    if (*pty >= 0)
 		close (*pty);
+	}
 #else /* !CRAY */
 #ifdef sgi
+	{
 	    char *slave;
 	    slave = _getpty (pty, O_RDWR, 0622, 0);
 	    if ((*tty = open (slave, O_RDWR)) != -1)
 		return 0;
+	}
 #else
 #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
 	return openpty(pty, tty, ttydev, NULL, NULL);
 #else
 	strcpy (ttydev, "/dev/ttyxx");
 	strcpy (ptydev, "/dev/ptyxx");
 	while (PTYCHAR1[letter]) {
 	    ttydev [strlen(ttydev) - 2]  = ptydev [strlen(ptydev) - 2] =
 		    PTYCHAR1 [letter];
 	    while (PTYCHAR2[devindex]) {
 		ttydev [strlen(ttydev) - 1] = ptydev [strlen(ptydev) - 1] =
 			PTYCHAR2 [devindex];
 		if ((*pty = open (ptydev, O_RDWR)) >= 0 &&
 		    (*tty = open (ttydev, O_RDWR)) >= 0)
+		{
 			/*
 			 * We need to set things up for our next entry
 			 * into this function!
 			 */
 			(void) devindex++;
 			return(0);
+		}
 		if (*pty >= 0)
 		    close (*pty);
 		devindex++;
+	    }
 	    devindex = 0;
 	    (void) letter++;
+	}
 #endif /* BSD4_4 else not BSD4_4 */
 #endif /* sgi else not sgi */
 #endif /* CRAY else not CRAY */
 #endif /* umips && SYSTYPE_SYSV */
 #endif /* USE_GET_PSEUDOTTY */
 #endif /* SVR4 */
 	/*
 	 * We were unable to allocate a pty master!  Return an error
 	 * condition and let our caller terminate cleanly.
 	 */
 	return(1);
+}
 #endif