- (dtucker) [channels.c] isatty -> is_tty here too.

diff --git a/ChangeLog b/ChangeLog
index 1b704d4a4f72603f447899ad63a173d8eaa96735..9c93bb622b67fb1261c5a89c02e50e43618f8a58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
      [session.c channels.c]
      Rename the isatty argument to is_tty so we don't shadow
      isatty(3).  ok markus@
+ - (dtucker) [channels.c] isatty -> is_tty here too.
 
 20080615
  - (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc.

diff --git a/channels.c b/channels.c
index 64c1ce76d3c19235c9cc152a5219c915a085cbaf..7f0aaadf680dc80a4abfc09e542e2485df9f854c 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -239,7 +239,7 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd,
 
        if ((c->isatty = is_tty) != 0)
                debug2("channel %d: rfd %d isatty", c->self, c->rfd);
-       c->wfd_isatty = isatty || isatty(c->wfd);
+       c->wfd_isatty = is_tty || isatty(c->wfd);
 
        /* enable nonblocking mode */
        if (nonblock) {