diff options
author | mp <mp@FreeBSD.org> | 2007-10-15 15:23:07 +0000 |
---|---|---|
committer | mp <mp@FreeBSD.org> | 2007-10-15 15:23:07 +0000 |
commit | e4e90e0d081f4e523bded890aa1395aaa5dd615e (patch) | |
tree | 78199e1e0c4f2554e9867e58b0b0cb507482240d /contrib/tcsh | |
parent | 4669413153ac9e0365361b48db4e2a0cc5e37ef4 (diff) | |
parent | 7932b1362619e94f8cf27c1c6f79ad49ecc39a3b (diff) | |
download | FreeBSD-src-e4e90e0d081f4e523bded890aa1395aaa5dd615e.zip FreeBSD-src-e4e90e0d081f4e523bded890aa1395aaa5dd615e.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r172665,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/tcsh')
-rw-r--r-- | contrib/tcsh/sh.c | 4 | ||||
-rw-r--r-- | contrib/tcsh/sh.proc.c | 13 | ||||
-rw-r--r-- | contrib/tcsh/tc.const.c | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/contrib/tcsh/sh.c b/contrib/tcsh/sh.c index 57b1bef..89056f5 100644 --- a/contrib/tcsh/sh.c +++ b/contrib/tcsh/sh.c @@ -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); diff --git a/contrib/tcsh/sh.proc.c b/contrib/tcsh/sh.proc.c index bf6fb3a..a8ebc74 100644 --- a/contrib/tcsh/sh.proc.c +++ b/contrib/tcsh/sh.proc.c @@ -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 == '%') { diff --git a/contrib/tcsh/tc.const.c b/contrib/tcsh/tc.const.c index e7c92f4..d63de6f 100644 --- a/contrib/tcsh/tc.const.c +++ b/contrib/tcsh/tc.const.c @@ -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' }; |