From owner-svn-src-stable-7@FreeBSD.ORG  Wed Jul 14 15:11:30 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31B591065670;
	Wed, 14 Jul 2010 15:11:30 +0000 (UTC) (envelope-from mp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2031C8FC1E;
	Wed, 14 Jul 2010 15:11:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6EFBUHM000936;
	Wed, 14 Jul 2010 15:11:30 GMT (envelope-from mp@svn.freebsd.org)
Received: (from mp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6EFBTK6000933;
	Wed, 14 Jul 2010 15:11:30 GMT (envelope-from mp@svn.freebsd.org)
Message-Id: <201007141511.o6EFBTK6000933@svn.freebsd.org>
From: Mark Peek <mp@FreeBSD.org>
Date: Wed, 14 Jul 2010 15:11:29 +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: r210057 - stable/7/contrib/tcsh
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jul 2010 15:11:30 -0000

Author: mp
Date: Wed Jul 14 15:11:29 2010
New Revision: 210057
URL: http://svn.freebsd.org/changeset/base/210057

Log:
  MFC r184072: Actually fix pty detection for autologout setting.

Modified:
  stable/7/contrib/tcsh/sh.c
  stable/7/contrib/tcsh/tc.const.c
Directory Properties:
  stable/7/contrib/tcsh/   (props changed)

Modified: stable/7/contrib/tcsh/sh.c
==============================================================================
--- stable/7/contrib/tcsh/sh.c	Wed Jul 14 14:52:35 2010	(r210056)
+++ stable/7/contrib/tcsh/sh.c	Wed Jul 14 15:11:29 2010	(r210057)
@@ -462,7 +462,7 @@ main(int argc, char **argv)
 	    else
 		cp2 = cp;
 	    if (!(((Strncmp(cp2, STRtty, 3) == 0) && Isalpha(cp2[3])) ||
-	          Strstr(cp, STRslptssl) != NULL)) {
+	          Strstr(cp, STRptssl) != NULL)) {
 		if (getenv("DISPLAY") == NULL) {
 		    /* NOT on X window shells */
 		    setcopy(STRautologout, STRdefautologout, VAR_READWRITE);

Modified: stable/7/contrib/tcsh/tc.const.c
==============================================================================
--- stable/7/contrib/tcsh/tc.const.c	Wed Jul 14 14:52:35 2010	(r210056)
+++ stable/7/contrib/tcsh/tc.const.c	Wed Jul 14 15:11:29 2010	(r210057)
@@ -46,7 +46,7 @@ Char STRautomatic[]	= { 'a', 'u', 't', '
 Char STRhangup[]	= { 'h', 'a', 'n', 'g', 'u', 'p', '\0' };
 Char STRaout[]		= { 'a', '.', 'o', 'u', 't', '\0' };
 Char STRtty[]		= { 't', 't', 'y', '\0' };
-Char STRslptssl[]	= { '/', 'p', 't', 's', '/', '\0' };
+Char STRptssl[]		= { 'p', 't', 's', '/', '\0' };
 Char STRany[]		= { 'a', 'n', 'y', '\0' };
 Char STRstatus[]	= { 's', 't', 'a', 't', 'u', 's', '\0' };
 Char STR0[]		= { '0', '\0' };