d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import two vendor fixes from tcsh-6.15.01 for MFC to 7.0. The fixes are:

Browse Source 
- Fix pty detection for autologout setting
  - kill `foo` got stuck because sigchld was disabled too soon

Requested by: re
This commit is contained in:
Mark Peek 2007-10-15 15:23:07 +00:00
parent 4f796ffc7b
commit 5c3ede8519
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/vendor/tcsh/dist/; revision=172665
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/tcsh/sh.c
View File

@ -457,12 +457,12 @@ main(int argc, char **argv)
if (*cp) {
/* only for login shells or root and we must have a tty */
if ((cp2 = Strrchr(cp, (Char) '/')) != NULL) {
cp = cp2 + 1;
cp2 = cp2 + 1;
}
else
cp2 = cp;
if (!(((Strncmp(cp2, STRtty, 3) == 0) && Isalpha(cp2[3])) ||
((Strncmp(cp, STRpts, 3) == 0) && cp[3] == '/'))) {
Strstr(cp, STRslptssl) != NULL)) {
if (getenv("DISPLAY") == NULL) {
/* NOT on X window shells */
setcopy(STRautologout, STRdefautologout, VAR_READWRITE);

13
contrib/tcsh/sh.proc.c
View File

@ -1428,13 +1428,6 @@ pkill(Char **v, int signum)
pid_t pid;
Char *cp, **vp, **globbed;
pchild_disabled++;
cleanup_push(&pchild_disabled, disabled_cleanup);
if (setintr) {
pintr_disabled++;
cleanup_push(&pintr_disabled, disabled_cleanup);
}
/* Avoid globbing %?x patterns */
for (vp = v; vp && *vp; vp++)
if (**vp == '%')
@ -1444,6 +1437,12 @@ pkill(Char **v, int signum)
globbed = v;
cleanup_push(globbed, blk_cleanup);
pchild_disabled++;
cleanup_push(&pchild_disabled, disabled_cleanup);
if (setintr) {
pintr_disabled++;
cleanup_push(&pintr_disabled, disabled_cleanup);
}
while (v && (cp = *v)) {
if (*cp == '%') {

2
contrib/tcsh/tc.const.c
View File

@ -46,7 +46,7 @@ Char STRautomatic[] = { 'a', 'u', 't', 'o', 'm', 'a', 't', 'i', 'c',
Char STRhangup[] = { 'h', 'a', 'n', 'g', 'u', 'p', '\0' };
Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' };
Char STRtty[] = { 't', 't', 'y', '\0' };
Char STRpts[] = { 'p', 't', 's', '\0' };
Char STRslptssl[] = { '/', 'p', 't', 's', '/', '\0' };
Char STRany[] = { 'a', 'n', 'y', '\0' };
Char STRstatus[] = { 's', 't', 'a', 't', 'u', 's', '\0' };
Char STR0[] = { '0', '\0' };