|
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
|
|
#
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
# Please add additional copyright information _after_ the line containing
|
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
|
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
|
|
#
|
|
# ROCK Linux: rock-src/package/x11/xorg/xconsole-pty.patch
|
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
# of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# --- ROCK-COPYRIGHT-NOTE-END ---
|
|
|
|
--- ./programs/xconsole/xconsole.c.orig Sun Mar 21 08:35:37 1999
|
|
+++ ./programs/xconsole/xconsole.c Thu Nov 23 16:15:23 2000
|
|
@@ -786,6 +786,21 @@
|
|
return 0;
|
|
}
|
|
#else
|
|
+#ifdef __GLIBC__ /* The new way to open a Pseudo Terminal */
|
|
+ if ((*pty = getpt()) < 0)
|
|
+ return 1;
|
|
+ strcpy(ttydev, ptsname(*pty));
|
|
+ if ((unlockpt(*pty)) < 0) {
|
|
+ close(*pty);
|
|
+ return(1);
|
|
+ }
|
|
+ if ((grantpt(*pty)) < 0) {
|
|
+ close(*pty);
|
|
+ return(1);
|
|
+ }
|
|
+ if ((*tty = open (ttydev, O_RDWR)) >= 0)
|
|
+ return(0);
|
|
+#else
|
|
strcpy (ttydev, "/dev/ttyxx");
|
|
strcpy (ptydev, "/dev/ptyxx");
|
|
while (PTYCHAR1[letter]) {
|
|
@@ -811,6 +826,7 @@
|
|
devindex = 0;
|
|
(void) letter++;
|
|
}
|
|
+#endif
|
|
#endif /* sgi else not sgi */
|
|
#endif /* CRAY else not CRAY */
|
|
#endif /* umips && SYSTYPE_SYSV */
|