* ser-unix.c (get_tty_state): if a descriptor is not a tty, then

simply save encode this fact as the process group and return
	  success rather than an error.
	  (set_tty_state): if process group is -1, do not reset the
	  process group.
	  (hardwire_reachar): comment change.
This commit is contained in:
K. Richard Pixley 1993-08-13 21:48:39 +00:00
parent 0e5f1b37f6
commit 057c2f4773
2 changed files with 21 additions and 4 deletions

View File

@ -1,5 +1,12 @@
Fri Aug 13 14:37:05 1993 K. Richard Pixley (rich@sendai.cygnus.com) Fri Aug 13 14:37:05 1993 K. Richard Pixley (rich@sendai.cygnus.com)
* ser-unix.c (get_tty_state): if a descriptor is not a tty, then
simply save encode this fact as the process group and return
success rather than an error.
(set_tty_state): if process group is -1, do not reset the
process group.
(hardwire_reachar): comment change.
* serial.h: comment change. * serial.h: comment change.
* config/m88k/tm-m88k.h: comment change to remove embedded * config/m88k/tm-m88k.h: comment change to remove embedded

View File

@ -109,6 +109,7 @@ get_tty_state(scb, state)
struct hardwire_ttystate *state; struct hardwire_ttystate *state;
{ {
#ifdef HAVE_TERMIOS #ifdef HAVE_TERMIOS
extern int errno;
pid_t new_process_group; pid_t new_process_group;
if (tcgetattr(scb->fd, &state->termios) < 0) if (tcgetattr(scb->fd, &state->termios) < 0)
@ -117,9 +118,14 @@ get_tty_state(scb, state)
if (!job_control) if (!job_control)
return 0; return 0;
/* Apparently, if a tty has no process group, then tcgetpgrp returns -1 with
errno == 0. In this case, set the process group to -1 so that we know to
omit resetting it later. */
new_process_group = tcgetpgrp (scb->fd); new_process_group = tcgetpgrp (scb->fd);
if (new_process_group == (pid_t)-1) if ((new_process_group == (pid_t)-1)
&& (errno != ENOTTY))
return -1; return -1;
errno = 0;
state->process_group = new_process_group; state->process_group = new_process_group;
return 0; return 0;
#endif #endif
@ -159,7 +165,11 @@ set_tty_state(scb, state)
if (!job_control) if (!job_control)
return 0; return 0;
return tcsetpgrp (scb->fd, state->process_group); /* If the tty had no process group before, then do not reset it. */
if (state->process_group == -1)
return 0;
else
return tcsetpgrp (scb->fd, state->process_group);
#endif #endif
#ifdef HAVE_TERMIO #ifdef HAVE_TERMIO
@ -491,8 +501,8 @@ wait_for(scb, timeout)
/* Read a character with user-specified timeout. TIMEOUT is number of seconds /* Read a character with user-specified timeout. TIMEOUT is number of seconds
to wait, or -1 to wait forever. Use timeout of 0 to effect a poll. Returns to wait, or -1 to wait forever. Use timeout of 0 to effect a poll. Returns
char if successful. Returns -2 if timeout expired, EOF if line dropped char if successful. Returns SERIAL_TIMEOUT if timeout expired, EOF if line
dead, or -3 for any other error (see errno in that case). */ dropped dead, or SERIAL_ERROR for any other error (see errno in that case). */
static int static int
hardwire_readchar(scb, timeout) hardwire_readchar(scb, timeout)