- (djm) Cleanup sshpty.c a little
diff --git a/ChangeLog b/ChangeLog
index 9176fa0..1d280f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
clear select masks if we return before calling select().
- (djm) "make veryclean" fix from Tom Holroyd <tomh@po.crl.go.jp>
- (djm) Clean some autoconf-2.52 junk when doing "make distclean"
+ - (djm) Cleanup sshpty.c a little
20011010
- (djm) OpenBSD CVS Sync
@@ -6715,4 +6716,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1605 2001/10/12 09:15:27 djm Exp $
+$Id: ChangeLog,v 1.1606 2001/10/12 09:15:48 djm Exp $
diff --git a/sshpty.c b/sshpty.c
index f88658b..e1e6031 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -249,17 +249,20 @@
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 @@
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 @@
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 @@
else {
close(fd);
}
-#endif
+#endif /* _CRAY */
}
/* Changes the window size associated with the pty. */