tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2008/06/16 13:22:53 

[session.c channels.c]
     Rename the isatty argument to is_tty so we don't shadow
     isatty(3).  ok markus@
This commit is contained in:
Darren Tucker 2008-06-16 23:29:18 +10:00
parent 87d5e0976c
commit ed3cdc0a7c
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,10 @@
20080616
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2008/06/16 13:22:53
[session.c channels.c]
Rename the isatty argument to is_tty so we don't shadow
isatty(3). ok markus@
20080615 20080615
- (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc. - (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc.
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4399,4 +4406,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5019 2008/06/15 21:59:23 djm Exp $ $Id: ChangeLog,v 1.5020 2008/06/16 13:29:18 dtucker Exp $

10
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.281 2008/06/15 20:06:26 djm Exp $ */ /* $OpenBSD: channels.c,v 1.282 2008/06/16 13:22:53 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -221,7 +221,7 @@ channel_lookup(int id)
*/ */
static void static void
channel_register_fds(Channel *c, int rfd, int wfd, int efd, channel_register_fds(Channel *c, int rfd, int wfd, int efd,
int extusage, int nonblock, int isatty) int extusage, int nonblock, int is_tty)
{ {
/* Update the maximum file descriptor value. */ /* Update the maximum file descriptor value. */
channel_max_fd = MAX(channel_max_fd, rfd); channel_max_fd = MAX(channel_max_fd, rfd);
@ -237,7 +237,7 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd,
c->efd = efd; c->efd = efd;
c->extended_usage = extusage; c->extended_usage = extusage;
if ((c->isatty = isatty) != 0) if ((c->isatty = is_tty) != 0)
debug2("channel %d: rfd %d isatty", c->self, c->rfd); debug2("channel %d: rfd %d isatty", c->self, c->rfd);
c->wfd_isatty = isatty || isatty(c->wfd); c->wfd_isatty = isatty || isatty(c->wfd);
@ -742,13 +742,13 @@ channel_register_filter(int id, channel_infilter_fn *ifn,
void void
channel_set_fds(int id, int rfd, int wfd, int efd, channel_set_fds(int id, int rfd, int wfd, int efd,
int extusage, int nonblock, int isatty, u_int window_max) int extusage, int nonblock, int is_tty, u_int window_max)
{ {
Channel *c = channel_lookup(id); Channel *c = channel_lookup(id);
if (c == NULL || c->type != SSH_CHANNEL_LARVAL) if (c == NULL || c->type != SSH_CHANNEL_LARVAL)
fatal("channel_activate for non-larval channel %d.", id); fatal("channel_activate for non-larval channel %d.", id);
channel_register_fds(c, rfd, wfd, efd, extusage, nonblock, isatty); channel_register_fds(c, rfd, wfd, efd, extusage, nonblock, is_tty);
c->type = SSH_CHANNEL_OPEN; c->type = SSH_CHANNEL_OPEN;
c->local_window = c->local_window_max = window_max; c->local_window = c->local_window_max = window_max;
packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST); packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST);

6
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.240 2008/06/15 20:06:26 djm Exp $ */ /* $OpenBSD: session.c,v 1.241 2008/06/16 13:22:53 dtucker Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -2285,7 +2285,7 @@ session_input_channel_req(Channel *c, const char *rtype)
} }
void void
session_set_fds(Session *s, int fdin, int fdout, int fderr, int isatty) session_set_fds(Session *s, int fdin, int fdout, int fderr, int is_tty)
{ {
if (!compat20) if (!compat20)
fatal("session_set_fds: called for proto != 2.0"); fatal("session_set_fds: called for proto != 2.0");
@ -2298,7 +2298,7 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr, int isatty)
channel_set_fds(s->chanid, channel_set_fds(s->chanid,
fdout, fdin, fderr, fdout, fdin, fderr,
fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ, fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
1, isatty, CHAN_SES_WINDOW_DEFAULT); 1, is_tty, CHAN_SES_WINDOW_DEFAULT);
} }
/* /*