svn commit: r184072 - head/contrib/tcsh

[Ruslan Ermilov]

Author: ru
Date: Mon Oct 20 08:44:14 2008
New Revision: 184072
URL: http://svn.freebsd.org/changeset/base/184072

Log:
  Actually fix pty detection for autologout setting.
  (The fix has been submitted upstream.)

Modified:
  head/contrib/tcsh/sh.c
  head/contrib/tcsh/tc.const.c

Modified: head/contrib/tcsh/sh.c
==============================================================================
--- head/contrib/tcsh/sh.c	Mon Oct 20 05:42:38 2008	(r184071)
+++ head/contrib/tcsh/sh.c	Mon Oct 20 08:44:14 2008	(r184072)
@@ -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: head/contrib/tcsh/tc.const.c
==============================================================================
--- head/contrib/tcsh/tc.const.c	Mon Oct 20 05:42:38 2008	(r184071)
+++ head/contrib/tcsh/tc.const.c	Mon Oct 20 08:44:14 2008	(r184072)
@@ -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' };