From 1a48aecfbca9459ff5bfe07952d0914fda754bcb Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 16 Jun 2008 23:35:56 +1000
Subject:  - (dtucker) [channels.c] isatty -> is_tty here too.

---
 ChangeLog  | 3 ++-
 channels.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cca9d1e9..6185f4408 100644
--- 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.
@@ -4406,4 +4407,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5020 2008/06/16 13:29:18 dtucker Exp $
+$Id: ChangeLog,v 1.5021 2008/06/16 13:35:56 dtucker Exp $
diff --git a/channels.c b/channels.c
index 64c1ce76d..7f0aaadf6 100644
--- 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) {
-- 
cgit v1.2.3