nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-03 04:22:47 -05:00
Code Issues Projects Releases Wiki Activity

Jacob points out that I introduced a bug in PSFTP when I did the

Browse Source 
timing shakeup: just running `psftp' caused the net/stdin select
loop (on both Unix and Windows) to get confused at the lack of any
network connection and give up immediately. Should now be fixed.

[originally from svn r4993]
This commit is contained in:
Simon Tatham
2004-12-16 19:15:38 +00:00
parent 69303f2d3e
commit f1585f8f46
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
unix/uxsftp.c
View File

@ -355,7 +355,7 @@ char *dir_file_cat(char *dir, char *file)
* Do a select() between all currently active network fds and
* optionally stdin.
*/
static int ssh_sftp_do_select(int include_stdin)
static int ssh_sftp_do_select(int include_stdin, int no_fds_ok)
{
fd_set rset, wset, xset;
int i, fdcount, fdsize, *fdlist;
@ -372,7 +372,7 @@ static int ssh_sftp_do_select(int include_stdin)
for (fd = first_fd(&fdstate, &rwx); fd >= 0;
fd = next_fd(&fdstate, &rwx)) i++;
if (i < 1)
if (i < 1 && !no_fds_ok)
return -1; /* doom */
/* Expand the fdlist buffer if necessary. */
@ -457,13 +457,13 @@ static int ssh_sftp_do_select(int include_stdin)
*/
int ssh_sftp_loop_iteration(void)
{
return ssh_sftp_do_select(FALSE);
return ssh_sftp_do_select(FALSE, FALSE);
}
/*
* Read a PSFTP command line from stdin.
*/
char *ssh_sftp_get_cmdline(char *prompt)
char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
{
char *buf;
int buflen, bufsize, ret;
@ -475,7 +475,7 @@ char *ssh_sftp_get_cmdline(char *prompt)
buflen = bufsize = 0;
while (1) {
ret = ssh_sftp_do_select(TRUE);
ret = ssh_sftp_do_select(TRUE, no_fds_ok);
if (ret < 0) {
printf("connection died\n");
return NULL; /* woop woop */