From 62b669a6af4c659f45e05df2c46989a05a12ec35 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 18 Jun 2012 15:32:02 -0600 Subject: [PATCH] dtterm: disable svr4 streams semantics on linux --- cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c index 453bf364..e6e3eedb 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c @@ -42,15 +42,21 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-svr4.c /main/1 1996/04/21 1 #include "TermPrimOSDepI.h" #include "TermPrimDebug.h" #include "TermHeader.h" -#include #if !defined(linux) +#include #include #include #endif #include + +#if defined(linux) +#undef USE_STREAMS_BUFMOD +#endif + #ifdef USE_STREAMS_BUFMOD #include #endif /* USE_STREAMS_BUFMOD */ + #include /* 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 * SVR4.2. Not sure where else this applies. */ +#if !defined(linux) if (ioctl(ptyFd, I_PUSH, "ptem") == -1) { (void) perror("Error pushing ptem"); /* exit the subprocess */ @@ -255,6 +262,8 @@ _DtTermPrimSetupPty(char *ptySlave, int ptyFd) } #endif /* USE_STREAMS_TTCOMPAT */ +#endif /* linux */ + /* success... */ return(0); } -- 2.25.1