summaryrefslogtreecommitdiff
path: root/contrib/tcsh
diff options
context:
space:
mode:
authorMark Peek <mp@FreeBSD.org>2007-10-15 16:54:07 +0000
committerMark Peek <mp@FreeBSD.org>2007-10-15 16:54:07 +0000
commit1dd6018d3b9b7095a4a97c68754bd872e0f22186 (patch)
tree1800694c4c728fb174cea3b68038100625c061ca /contrib/tcsh
parent5c3ede8519468d479b1c07173978240bbb2e85d1 (diff)
downloadsrc-test-1dd6018d3b9b7095a4a97c68754bd872e0f22186.tar.gz
src-test-1dd6018d3b9b7095a4a97c68754bd872e0f22186.zip
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
Notes
Notes: svn path=/vendor/tcsh/dist/; revision=172668
Diffstat (limited to 'contrib/tcsh')
-rw-r--r--contrib/tcsh/sh.lex.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/tcsh/sh.lex.c b/contrib/tcsh/sh.lex.c
index 8eccb4d3e2932..0cccf47160594 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);