o use CLOCAL in conserver/comsent.c

o patch man pages to always refer to the config file in /usr/local/etc
This commit is contained in:
jason 1999-01-04 22:59:24 +00:00
parent dd3fa4ac54
commit cb5e8f8b85
3 changed files with 51 additions and 5 deletions

View File

@ -1,13 +1,25 @@
--- ./conserver/consent.c Sat Nov 22 20:21:46 1997
+++ ./conserver/consent.c Sat Aug 23 18:05:11 1997
@@ -206,5 +206,5 @@
--- ./conserver/consent.c.orig Sun Jan 3 18:32:32 1999
+++ ./conserver/consent.c Mon Jan 4 08:13:38 1999
@@ -197,7 +197,7 @@
*/
termp.c_iflag = IXON|IXOFF|BRKINT;
termp.c_oflag = 0;
- termp.c_cflag = CREAD;
+ termp.c_cflag = CREAD|CLOCAL;
termp.c_cflag |= pCE->pparity->iset;
termp.c_lflag = 0;
/*
@@ -205,7 +205,7 @@
* Set the VTIME == 1 (0.1 sec)
* Don't bother with the control characters as they are not used
*/
- termp.c_cc[VMIN] = 128;
+ termp.c_cc[VMIN] = 1;
termp.c_cc[VTIME] = 1;
@@ -425,13 +425,13 @@
if (-1 == cfsetospeed(&termp,pCE->pbaud->irate)) {
@@ -424,15 +424,15 @@
#endif
#if USE_TERMIOS
- if (0 != ioctl(0, TCGETS, & n_tio)) {
@ -25,10 +37,13 @@
+ n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
n_tio.c_lflag |= ISIG|ICANON|ECHO;
n_tio.c_cc[VEOF] = '\004';
@@ -445,5 +445,5 @@
n_tio.c_cc[VEOL] = '\000';
@@ -444,7 +444,7 @@
n_tio.c_cc[VSTART] = '\021';
n_tio.c_cc[VSTOP] = '\023';
n_tio.c_cc[VSUSP] = '\032';
- if (0 != ioctl(0, TCSETS, & n_tio)) {
+ if (0 != tcsetattr(0, TCSANOW, & n_tio)) {
fprintf(stderr, "%s: getarrt: %s\n", progname, strerror(errno));
exit(1);
}

View File

@ -0,0 +1,20 @@
--- conserver/conserver.man.orig Mon Jan 4 08:21:05 1999
+++ conserver/conserver.man Mon Jan 4 08:21:24 1999
@@ -38,7 +38,7 @@
.TP
.BI \-C config
With this option the invoker may specify an alternate confguration.
-The default \fIconfig\fP is /usr/local/lib/conserver.cf.
+The default \fIconfig\fP is /usr/local/etc/conserver.cf.
.TP
.B \-h
Output a brief help message.
@@ -65,7 +65,7 @@
.SH FILES
.TS
l l.
-/usr/local/lib/conserver.cf description of console terminal lines
+/usr/local/etc/conserver.cf description of console terminal lines
/usr/adm/\fIhost\fP.console log files for \fIhost\fP's console
/dev/tty?? terminal line device files
\fIstdout\fP summary of unloved console errors

View File

@ -0,0 +1,11 @@
--- conserver.cf/conserver.cf.5l.orig Mon Jan 4 08:22:08 1999
+++ conserver.cf/conserver.cf.5l Mon Jan 4 08:22:26 1999
@@ -4,7 +4,7 @@
.SH NAME
conserver.cf \- table of server console terminals used by conserver(8L)
.SH SYNOPSIS
-.B /usr/local/lib/conserver.cf
+.B /usr/local/etc/conserver.cf
.br
\fIaccess hosts\fP
.br