Update.

	* sysdeps/unix/sysv/linux/speed.c (IBAUD0): New definition.  Bit
	set in c_iflag if cfsetispeed is call with SPEED set to zero.
	(cfgetispeed): Return zero if prior if IBAUD0 is set.
	(cfsetospeed): Clear IBAUD0 bit.
	(cfgetispeed): Set IBAUD0 bit if necessary.
	* sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Clear
	the IBAUD0 bit in c_iflag when making the system call.
	Work around a Linux kernel bug which silently changes the
	PARENB/CREAD/CSIZE bits in c_cflag on pty.
	Based on a patch by H.J. Lu <hjl@gnu.org>.
	* Makeconfig (link-libc-static): Don't use link-libc since this
	includes the shared object.  Use gnulib only.

4 files changed, 90 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 9efa83f172..96280cdfb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,24 @@
 1998-12-07  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/unix/sysv/linux/speed.c (IBAUD0): New definition.  Bit
+	set in c_iflag if cfsetispeed is call with SPEED set to zero.
+	(cfgetispeed): Return zero if prior if IBAUD0 is set.
+	(cfsetospeed): Clear IBAUD0 bit.
+	(cfgetispeed): Set IBAUD0 bit if necessary.
+	* sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Clear
+	the IBAUD0 bit in c_iflag when making the system call.
+	Work around a Linux kernel bug which silently changes the
+	PARENB/CREAD/CSIZE bits in c_cflag on pty.
 	* sysdeps/unix/sysv/linux/speed.c (cfsetispeed): Make a real
 	function.  Don't set speed is SPEED parameter is zero since this
 	means set it to the output speed.
+	Based on a patch by H.J. Lu <hjl@gnu.org>.
 
 	* version.h (VERSION): Bump to 2.0.106.
 
+	* Makeconfig (link-libc-static): Don't use link-libc since this
+	includes the shared object.  Use gnulib only.
+
 1998-12-07 12:06  Ulrich Drepper  <drepper@cygnus.com>
 
 	* po/de.po: Update from translation team.
diff --git a/Makeconfig b/Makeconfig
index 962f702d55..dd7a566d49 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -444,7 +444,7 @@ link-extra-libs-static = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).a)
 else
 ifeq (yes,$(build-shared))
 # We can try to link the programs with lib*_pic.a...
-link-libc-static = $(link-libc) $(common-objpfx)libc_pic.a
+link-libc-static = $(gnulib) $(common-objpfx)libc_pic.a
 link-extra-libs-static = $(link-extra-libs)
 endif
 endif
diff --git a/sysdeps/unix/sysv/linux/speed.c b/sysdeps/unix/sysv/linux/speed.c
index a0aefd805a..5a23e53fc5 100644
--- a/sysdeps/unix/sysv/linux/speed.c
+++ b/sysdeps/unix/sysv/linux/speed.c
@@ -22,6 +22,17 @@
 #include <termios.h>
 
 
+/* This is a gross hack around a kernel bug.  If the cfsetispeed functions
+   is called with the SPEED argument set to zero this means use the same
+   speed as for output.  But we don't have independent input and output
+   speeds and therefore cannot record this.
+
+   We use an unused bit in the `c_iflag' field to keep track of this
+   use of `cfsetispeed'.  The value here must correspond to the one used
+   in `tcsetattr.c'.  */
+#define IBAUD0	020000000000
+
+
 /* Return the output baud rate stored in *TERMIOS_P.  */
 speed_t
 cfgetospeed (termios_p)
@@ -31,8 +42,16 @@ cfgetospeed (termios_p)
 }
 
 /* Return the input baud rate stored in *TERMIOS_P.
-   For Linux there is no difference between input and output speed.  */
-strong_alias (cfgetospeed, cfgetispeed);
+   Although for Linux there is no difference between input and output
+   speed, the numerical 0 is a special case for the input baud rate. It
+   should set the input baud rate to the output baud rate. */
+speed_t
+cfgetispeed (termios_p)
+     const struct termios *termios_p;
+{
+  return ((termios_p->c_iflag & IBAUD0)
+	  ? 0 : termios_p->c_cflag & (CBAUD | CBAUDEX));
+}
 
 /* Set the output baud rate stored in *TERMIOS_P to SPEED.  */
 int
@@ -47,6 +66,7 @@ cfsetospeed  (termios_p, speed)
       return -1;
     }
 
+  termios_p->c_iflag &= ~IBAUD0;
   termios_p->c_cflag &= ~(CBAUD | CBAUDEX);
   termios_p->c_cflag |= speed;
 
@@ -69,8 +89,11 @@ cfsetispeed (termios_p, speed)
       return -1;
     }
 
-  if (speed != 0)
+  if (speed == 0)
+    termios_p->c_iflag |= IBAUD0;
+  else
     {
+      termios_p->c_iflag &= ~IBAUD0;
       termios_p->c_cflag &= ~(CBAUD | CBAUDEX);
       termios_p->c_cflag |= speed;
     }
diff --git a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c
index dee491564f..4a352372c9 100644
--- a/sysdeps/unix/sysv/linux/tcsetattr.c
+++ b/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -28,6 +28,24 @@
 #include <kernel_termios.h>
 
 
+/* This is a gross hack around a kernel bug.  If the cfsetispeed functions
+   is called with the SPEED argument set to zero this means use the same
+   speed as for output.  But we don't have independent input and output
+   speeds and therefore cannot record this.
+
+   We use an unused bit in the `c_iflag' field to keep track of this
+   use of `cfsetispeed'.  The value here must correspond to the one used
+   in `speed.c'.  */
+#if !defined _HAVE_C_ISPEED || !defined _HAVE_C_OSPEED
+# define IBAUD0	020000000000
+#else
+/* If we have separate values for input and output speed don't bother
+   with this.  Define the value as zero so the compiler sees we don't
+   have to do the AND below.  */
+# define IBAUD0	0
+#endif
+
+
 /* Set the state of FD to *TERMIOS_P.  */
 int
 tcsetattr (fd, optional_actions, termios_p)
@@ -37,6 +55,7 @@ tcsetattr (fd, optional_actions, termios_p)
 {
   struct __kernel_termios k_termios;
   unsigned long int cmd;
+  int retval;
 
   switch (optional_actions)
     {
@@ -54,7 +73,7 @@ tcsetattr (fd, optional_actions, termios_p)
       return -1;
     }
 
-  k_termios.c_iflag = termios_p->c_iflag;
+  k_termios.c_iflag = termios_p->c_iflag & ~IBAUD0;
   k_termios.c_oflag = termios_p->c_oflag;
   k_termios.c_cflag = termios_p->c_cflag;
   k_termios.c_lflag = termios_p->c_lflag;
@@ -68,5 +87,34 @@ tcsetattr (fd, optional_actions, termios_p)
   memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
 	  __KERNEL_NCCS * sizeof (cc_t));
 
-  return __ioctl (fd, cmd, &k_termios);
+  retval = __ioctl (fd, cmd, &k_termios);
+
+  if (retval == 0 && cmd == TCSETS)
+    {
+      /* The Linux kernel has a bug which silently ignore the invalid
+	 c_cflag on pty. We have to check it here. */
+      int save = errno;
+      retval = __ioctl (fd, TCGETS, &k_termios);
+      if (retval)
+	{
+	  /* We cannot verify if the setting is ok. We don't return
+	     an error (?). */
+	  __set_errno (save);
+	  retval = 0;
+	}
+      else if ((termios_p->c_cflag & (PARENB | CREAD))
+	       != (k_termios.c_cflag & (PARENB | CREAD))
+	       || ((termios_p->c_cflag & CSIZE)
+		   && ((termios_p->c_cflag & CSIZE)
+		       != (k_termios.c_cflag & CSIZE))))
+	{
+	  /* It looks like the Linux kernel silently changed the
+	     PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
+	     error. */
+	  __set_errno (EINVAL);
+	  retval = -1;
+	}
+    }
+
+  return retval;
 }