kern/23173: read hangs in linux emulation

[Philipp Mergenthaler]

The following reply was made to PR kern/23173; it has been noted by GNATS.

From: Philipp Mergenthaler <philipp.mergenthaler at stud.uni-karlsruhe.de>
To: freebsd-gnats-submit at FreeBSD.org
Cc:  
Subject: Re: kern/23173: read hangs in linux emulation
Date: Sun, 11 May 2003 09:47:21 +0200

 I can confirm that this bug still exists in -current as of 2003-05-11
 and that the patch by Boris Nikolaus fixes it.
 
 It doesn't apply cleanly to -current anymore, though.  Below is an
 updated version.
 
 Bye, Philipp
 
 
 Index: linux_ioctl.c
 ===================================================================
 RCS file: /ncvs/src/sys/compat/linux/linux_ioctl.c,v
 retrieving revision 1.107
 diff -u -r1.107 linux_ioctl.c
 --- linux_ioctl.c	24 Apr 2003 23:36:35 -0000	1.107
 +++ linux_ioctl.c	11 May 2003 07:06:50 -0000
 @@ -345,7 +345,8 @@
  	lios->c_cc[LINUX_VLNEXT] = bios->c_cc[VLNEXT];
  
  	for (i=0; i<LINUX_NCCS; i++) {
 -		if (lios->c_cc[i] == _POSIX_VDISABLE)
 +		if (i != LINUX_VMIN && i != LINUX_VTIME &&
 +		    lios->c_cc[i] == _POSIX_VDISABLE)
  			lios->c_cc[i] = LINUX_POSIX_VDISABLE;
  	}
  	lios->c_line = 0;
 @@ -484,7 +485,8 @@
  	bios->c_cc[VLNEXT] = lios->c_cc[LINUX_VLNEXT];
  
  	for (i=0; i<NCCS; i++) {
 -		if (bios->c_cc[i] == LINUX_POSIX_VDISABLE)
 +		if (i != VMIN && i != VTIME &&
 +		    bios->c_cc[i] == LINUX_POSIX_VDISABLE)
  			bios->c_cc[i] = _POSIX_VDISABLE;
  	}