external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtterm: disable svr4 streams semantics on linux

Browse source
This commit is contained in:
Jon Trulson 2012-06-18 15:32:02 -06:00
parent bdd889c141
commit 62b669a6af
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c
View file

@ -42,15 +42,21 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-svr4.c /main/1 1996/04/21 1
#include "TermPrimOSDepI.h" #include "TermPrimOSDepI.h"
#include "TermPrimDebug.h" #include "TermPrimDebug.h"
#include "TermHeader.h" #include "TermHeader.h"
#include <stropts.h>
#if !defined(linux) #if !defined(linux)
#include <stropts.h>
#include <sys/conf.h> #include <sys/conf.h>
#include <sys/stream.h> #include <sys/stream.h>
#endif #endif
#include <sys/termios.h> #include <sys/termios.h>
#if defined(linux)
#undef USE_STREAMS_BUFMOD
#endif
#ifdef USE_STREAMS_BUFMOD #ifdef USE_STREAMS_BUFMOD
#include <sys/bufmod.h> #include <sys/bufmod.h>
#endif /* USE_STREAMS_BUFMOD */ #endif /* USE_STREAMS_BUFMOD */
#include <errno.h> #include <errno.h>
/* last ditch fallback. If the clone device is other than /dev/ptmx, /* last ditch fallback. If the clone device is other than /dev/ptmx,
@ -235,6 +241,7 @@ _DtTermPrimSetupPty(char *ptySlave, int ptyFd)
* they don't seem to stick after the file is closed on * they don't seem to stick after the file is closed on
* SVR4.2. Not sure where else this applies. * SVR4.2. Not sure where else this applies.
*/ */
#if !defined(linux)
if (ioctl(ptyFd, I_PUSH, "ptem") == -1) { if (ioctl(ptyFd, I_PUSH, "ptem") == -1) {
(void) perror("Error pushing ptem"); (void) perror("Error pushing ptem");
/* exit the subprocess */ /* exit the subprocess */
@ -255,6 +262,8 @@ _DtTermPrimSetupPty(char *ptySlave, int ptyFd)
} }
#endif /* USE_STREAMS_TTCOMPAT */ #endif /* USE_STREAMS_TTCOMPAT */
#endif /* linux */
/* success... */ /* success... */
return(0); return(0);
} }