diff options
| author | Damien Miller <djm@mindrot.org> | 2001-10-12 19:15:48 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-10-12 19:15:48 +1000 |
| commit | 4a820ea750ce79be709ca8c4b11edf39e07b2676 (patch) | |
| tree | 3e12750b64aae8fd2f7ba8e50a0c55731a42fc10 /sshpty.c | |
| parent | 7c734056f48c396fdd68ae1c441c372908b54fe9 (diff) | |
| download | openssh-git-4a820ea750ce79be709ca8c4b11edf39e07b2676.tar.gz | |
- (djm) Cleanup sshpty.c a little
Diffstat (limited to 'sshpty.c')
| -rw-r--r-- | sshpty.c | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -249,17 +249,20 @@ pty_release(const char *ttyname) void pty_make_controlling_tty(int *ttyfd, const char *ttyname) { -#ifdef _CRAY int fd; +#ifdef USE_VHANGUP + void *old; +#endif /* USE_VHANGUP */ +#ifdef _CRAY if (setsid() < 0) error("setsid: %.100s", strerror(errno)); fd = open(ttyname, O_RDWR|O_NOCTTY); if (fd != -1) { - signal(SIGHUP, SIG_IGN); + mysignal(SIGHUP, SIG_IGN); ioctl(fd, TCVHUP, (char *)NULL); - signal(SIGHUP, SIG_DFL); + mysignal(SIGHUP, SIG_DFL); setpgid(0, 0); close(fd); } else { @@ -273,11 +276,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) error("%.100s: %.100s", ttyname, strerror(errno)); close(*ttyfd); *ttyfd = fd; -#else - int fd; -#ifdef USE_VHANGUP - void *old; -#endif /* USE_VHANGUP */ +#else /* _CRAY */ /* First disconnect from the old controlling tty. */ #ifdef TIOCNOTTY @@ -310,9 +309,9 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) error("SETPGRP %s",strerror(errno)); #endif /* HAVE_NEWS4 */ #ifdef USE_VHANGUP - old = signal(SIGHUP, SIG_IGN); + old = mysignal(SIGHUP, SIG_IGN); vhangup(); - signal(SIGHUP, old); + mysignal(SIGHUP, old); #endif /* USE_VHANGUP */ fd = open(ttyname, O_RDWR); if (fd < 0) { @@ -333,7 +332,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) else { close(fd); } -#endif +#endif /* _CRAY */ } /* Changes the window size associated with the pty. */ |