diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-03-27 12:20:17 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-03-27 12:20:17 +0000 |
| commit | 95d5d1d071c29fcd2f4987ed1ef3cfd0ab204aa6 (patch) | |
| tree | 98cc0fb9308d885df5ad58a2b0efc12b44fe7f9c /mail/xmail | |
| parent | - Fix after objformat removal (diff) | |
Switch to <termios.h>
PR: 110872
Submitted by: Ed Schouten <ed@fxq.nl>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=188537
Diffstat (limited to 'mail/xmail')
| -rw-r--r-- | mail/xmail/files/patch-ad | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/mail/xmail/files/patch-ad b/mail/xmail/files/patch-ad index 475eff9dcdfd..53fcd326af4e 100644 --- a/mail/xmail/files/patch-ad +++ b/mail/xmail/files/patch-ad @@ -1,6 +1,20 @@ --- callMail.c.orig Thu Jan 26 21:52:01 1995 +++ callMail.c Wed Feb 4 23:30:07 1998 -@@ -81,7 +81,7 @@ +@@ -38,11 +38,10 @@ + #include <sys/select.h> + #endif + +-#if !(defined(SYSV) || defined(linux)) || defined(clipper) ++#if !(defined(SYSV) || defined(linux) || defined(__FreeBSD__)) || defined(clipper) + #include <sgtty.h> + #else +-#include <sys/termio.h> +-#include <sys/sysmacros.h> ++#include <sys/termios.h> + #include <fcntl.h> + #if defined(att) + #include <sys/stropts.h> +@@ -81,7 +80,7 @@ #ifdef hpux #define PTYCHAR2 "fedcba9876543210" #else /* !hpux */ @@ -9,3 +23,33 @@ #endif /* !hpux */ #endif /* !PTYCHAR2 */ +@@ -207,8 +206,8 @@ + callMail(argv) + char *argv[]; + { +-#if defined(linux) || (defined(SYSV) && !defined(clipper)) +- struct termio tio; ++#if defined(linux) || defined(__FreeBSD__) || (defined(SYSV) && !defined(clipper)) ++ struct termios tio; + #else + struct sgttyb Sgtty; + #endif +@@ -223,14 +222,14 @@ + /* + ** Set minimal requirements for slave connection (no echo, no NL->CR, keep TABS) + */ +-#if defined(linux) || (defined(SYSV) && !defined(clipper)) +- (void) ioctl(slave, TCGETA, &tio); +- tio.c_oflag &= ~(OCRNL|ONLCR|ONLRET|TABDLY); ++#if defined(linux) || defined(__FreeBSD__) || (defined(SYSV) && !defined(clipper)) ++ tcgetattr(slave, &tio); ++ tio.c_oflag &= ~(OCRNL|ONLCR|ONLRET|OXTABS); + tio.c_iflag &= ~IXOFF; + tio.c_iflag |= ICRNL; + tio.c_lflag &= ~(ISIG|ECHO); + tio.c_lflag |= ICANON; +- (void) ioctl(slave, TCSETA, &tio); ++ tcsetattr(slave, TCSANOW, &tio); + #else + (void) ioctl(slave, TIOCGETP, &Sgtty); + Sgtty.sg_flags &= ~(ECHO|CRMOD|XTABS); |