svn commit: r210057 - stable/7/contrib/tcsh

[Mark Peek]

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' };