diff options
Diffstat (limited to 'comms/conserver/files/patch-ac')
| -rw-r--r-- | comms/conserver/files/patch-ac | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/comms/conserver/files/patch-ac b/comms/conserver/files/patch-ac index 3081ae3f0a16..dc4a1bb3a2ef 100644 --- a/comms/conserver/files/patch-ac +++ b/comms/conserver/files/patch-ac @@ -1,22 +1,16 @@ ---- ./conserver/group.c Sat Nov 22 20:11:49 1997 -+++ ./conserver/group.c Sat Aug 23 17:19:13 1997 -@@ -406,7 +406,7 @@ - continue; - } - /* read terminal line */ -- if ((nr = read(pCEServing->fdtty, acIn, sizeof(acIn))) < 0) { -+ if ((nr = read(pCEServing->fdtty, acIn, sizeof(acIn))) <= 0) { - /* carrier lost */ - fprintf(stderr, "%s: lost carrier on %s (%s)!\n", progname, pCEServing->server, pCEServing->dfile); - #if DO_VIRTUAL -@@ -750,5 +750,5 @@ - CSTROUT(pCLServing->fd, "- "); - if (-1 == tcsendbreak(pCEServing->fdtty, 9)) { +--- etc/conserver/group.c.orig Wed Nov 17 18:07:38 1999 ++++ etc/conserver/group.c Wed Nov 17 18:09:43 1999 +@@ -902,7 +902,7 @@ + #endif + #if USE_TERMIO + if (-1 == ioctl(pCEServing->fdtty, TCSBRK, (char *)0)) { - CSTROUT(pCLServing->fd, "failed]\r\n"); + CSTROUT(pCLServing->fd, "tcsendbreak failed]\r\n"); continue; } -@@ -1119,11 +1119,9 @@ + #else +@@ -1274,15 +1274,12 @@ + continue; } #if !defined(XTABS) /* XXX hack */ -#define XTABS TAB3 @@ -25,9 +19,13 @@ - if (XTABS == (TABDLY&sbuf.c_oflag)) { - sbuf.c_oflag &= ~TABDLY; - sbuf.c_oflag |= TAB0; -+ if (XTABS & sbuf.c_oflag) { -+ sbuf.c_oflag &= ~XTABS; - } else { +- } else { - sbuf.c_oflag &= ~TABDLY; ++ if (XTABS & sbuf.c_oflag) ++ sbuf.c_oflag &= ~XTABS; ++ else sbuf.c_oflag |= XTABS; - } +- } + if (-1 == tcsetattr(pCEServing->fdtty, TCSANOW, & sbuf)) { + CSTROUT(pCLServing->fd, "failed]\r\n"); + continue; |