summaryrefslogtreecommitdiffstats
path: root/contrib/tcsh
diff options
context:
space:
mode:
authormp <mp@FreeBSD.org>2007-10-15 16:54:07 +0000
committermp <mp@FreeBSD.org>2007-10-15 16:54:07 +0000
commit5174ae62f98b1daa4649059d8e7db5d3c8a296a0 (patch)
tree1800694c4c728fb174cea3b68038100625c061ca /contrib/tcsh
parent7932b1362619e94f8cf27c1c6f79ad49ecc39a3b (diff)
downloadFreeBSD-src-5174ae62f98b1daa4649059d8e7db5d3c8a296a0.zip
FreeBSD-src-5174ae62f98b1daa4649059d8e7db5d3c8a296a0.tar.gz
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
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 8eccb4d..0cccf47 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);
OpenPOWER on IntegriCloud