From owner-p4-projects@FreeBSD.ORG  Sun Sep 21 21:10:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BB591065673; Sun, 21 Sep 2008 21:10:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2204D1065671
	for <perforce@FreeBSD.org>; Sun, 21 Sep 2008 21:10:03 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 110E78FC08
	for <perforce@FreeBSD.org>; Sun, 21 Sep 2008 21:10:03 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8LLA2K7032740
	for <perforce@FreeBSD.org>; Sun, 21 Sep 2008 21:10:02 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8LLA25m032738
	for perforce@freebsd.org; Sun, 21 Sep 2008 21:10:02 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sun, 21 Sep 2008 21:10:02 GMT
Message-Id: <200809212110.m8LLA25m032738@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 150235 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Sep 2008 21:10:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=150235

Change 150235 by ed@ed_dull on 2008/09/21 21:09:33

	When the hook doesn't implement rint, but has a rint_bypass
	hook, use a default rint implementation that just converts calls
	to rint_bypass.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/tty.c#41 edit

Differences ...

==== //depot/projects/mpsafetty/sys/kern/tty.c#41 (text+ko) ====

@@ -1655,6 +1655,16 @@
 		ttydevsw_inwakeup(tp);
 }
 
+static int
+ttyhook_defrint(struct tty *tp, char c, int flags)
+{
+
+	if (ttyhook_rint_bypass(tp, &c, 1) != 1)
+		return (-1);
+	
+	return (0);
+}
+
 int
 ttyhook_register(struct tty **rtp, struct thread *td, int fd,
     struct ttyhook *th, void *softc)
@@ -1700,6 +1710,10 @@
 	/* Maybe we can switch into bypass mode now. */
 	ttydisc_optimize(tp);
 
+	/* Silently convert rint() calls to rint_bypass() when possible. */
+	if (!ttyhook_hashook(tp, rint) && ttyhook_hashook(tp, rint_bypass))
+		th->th_rint = ttyhook_defrint;
+
 done3:	tty_unlock(tp);
 done2:	dev_relthread(dev);
 done1:	fdrop(fp, td);