From 1dd6018d3b9b7095a4a97c68754bd872e0f22186 Mon Sep 17 00:00:00 2001
From: Mark Peek <mp@FreeBSD.org>
Date: Mon, 15 Oct 2007 16:54:07 +0000
Subject: [PATCH] Import two vendor fixes from tcsh-6.15.01 for MFC to 7.0. The
 fixes are:     - Fix pty detection for autologout setting     - kill `foo`
 got stuck because sigchld was disabled too soon

Requested by: re
---
 contrib/tcsh/sh.lex.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/tcsh/sh.lex.c b/contrib/tcsh/sh.lex.c
index 8eccb4d3e293..0cccf4716059 100644
--- a/contrib/tcsh/sh.lex.c
+++ b/contrib/tcsh/sh.lex.c
@@ -851,8 +851,7 @@ getsub(struct wordent *en)
 	    return (en);
 	}
 	slhs.len = 0;
-	if (lhsb.s != NULL && lhsb.len != 0)
-	    Strbuf_append(&slhs, lhsb.s);
+	Strbuf_append(&slhs, lhsb.s);
 	Strbuf_terminate(&slhs);
 	if (exclc)
 	    en = dosub(sc, en, global);