From owner-svn-src-stable@FreeBSD.ORG  Sun Mar 22 08:09:16 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7DB34106564A;
	Sun, 22 Mar 2009 08:09:16 +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 6B3BB8FC0C;
	Sun, 22 Mar 2009 08:09:16 +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 n2M89GYE061660;
	Sun, 22 Mar 2009 08:09:16 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2M89GAr061659;
	Sun, 22 Mar 2009 08:09:16 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200903220809.n2M89GAr061659@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 22 Mar 2009 08:09:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190253 - stable/7/bin/sh
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Mar 2009 08:09:17 -0000

Author: ed
Date: Sun Mar 22 08:09:16 2009
New Revision: 190253
URL: http://svn.freebsd.org/changeset/base/190253

Log:
  MFC:
  
    Don't disable CR-to-NL translation when waiting for data to arrive.
  
    A difference between the old and the new TTY layer is that the new
    implementation does not perform any post-processing before returning
    data back to userspace when calling read().
  
    sh(1)'s read turns the TTY into a raw mode before calling select(). This
    means that the first character will not receive any ICRNL processing.
    Inherit this flag from the original terminal attributes.
  
    Even though this issue is not present on RELENG_*, I'm MFCing it to make
    sh(1) in jails behave better.
  
    PR:		bin/129566

Modified:
  stable/7/bin/sh/   (props changed)
  stable/7/bin/sh/miscbltin.c

Modified: stable/7/bin/sh/miscbltin.c
==============================================================================
--- stable/7/bin/sh/miscbltin.c	Sun Mar 22 06:47:29 2009	(r190252)
+++ stable/7/bin/sh/miscbltin.c	Sun Mar 22 08:09:16 2009	(r190253)
@@ -147,6 +147,7 @@ readcmd(int argc __unused, char **argv _
 		if (tcgetattr(0, &told) == 0) {
 			memcpy(&tnew, &told, sizeof(told));
 			cfmakeraw(&tnew);
+			tnew.c_iflag |= told.c_iflag & ICRNL;
 			tcsetattr(0, TCSANOW, &tnew);
 			tsaved = 1;
 		}