From owner-svn-src-head@FreeBSD.ORG  Sat Dec 13 07:23:55 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8EE931065673;
	Sat, 13 Dec 2008 07:23:55 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F85D8FC1A;
	Sat, 13 Dec 2008 07:23:55 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBD7NtuW022202;
	Sat, 13 Dec 2008 07:23:55 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBD7NtjM022201;
	Sat, 13 Dec 2008 07:23:55 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200812130723.mBD7NtjM022201@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 13 Dec 2008 07:23:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186030 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Dec 2008 07:23:55 -0000

Author: ed
Date: Sat Dec 13 07:23:55 2008
New Revision: 186030
URL: http://svn.freebsd.org/changeset/base/186030

Log:
  Add FIONREAD to pseudo-terminal master devices.
  
  All ioctl()'s that aren't implemented by pts(4) are forwarded to the TTY
  itself. Unfortunately this is not correct for FIONREAD, because it will
  give the wrong amount of bytes that are available to read.
  
  Tested by:	keramida
  Reminded by:	keramida

Modified:
  head/sys/kern/tty_pts.c

Modified: head/sys/kern/tty_pts.c
==============================================================================
--- head/sys/kern/tty_pts.c	Sat Dec 13 07:03:16 2008	(r186029)
+++ head/sys/kern/tty_pts.c	Sat Dec 13 07:23:55 2008	(r186030)
@@ -273,6 +273,16 @@ ptsdev_ioctl(struct file *fp, u_long cmd
 	case FIONBIO:
 		/* This device supports non-blocking operation. */
 		return (0);
+	case FIONREAD:
+		tty_lock(tp);
+		if (psc->pts_flags & PTS_FINISHED) {
+			/* Force read() to be called. */
+			*(int *)data = 1;
+		} else {
+			*(int *)data = ttydisc_getc_poll(tp);
+		}
+		tty_unlock(tp);
+		return (0);
 	case FIODGNAME: {
 		struct fiodgname_arg *fgn;
 		const char *p;