simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  dcb93d60 pscp: fix another newline problem in output.
  ad487da0 pscp: remove redundant progress bar indicator.
  78e280a1 pscp: remove a relic of GUI feedback mode.
  72a8c8c4 ssh2 conn: don't accept user input until mainchan is ready.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2018-10-02 18:43:32

commit dcb93d60e6e8d5d7aa6fef3d981fa16a7a2c96d0
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=dcb93d60e6e8d5d7aa6fef3d981fa16a7a2c96d0;hp=5d6d052d8b28bdaf4fc0cba29234909727f46b6c
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Oct 2 18:25:53 2018 +0100

    pscp: fix another newline problem in output.
    
    In commit 54b300f15, I managed to set the progress_bar_displayed flag
    just _after_, rather than before, the call to abandon_progress_bar
    that moves to the new line once the file has finished copying. So in
    the case where a file is so small that the very first displaying of
    the transfer statistics is already at 100% completion, the flag
    wouldn't be set when abandon_progress_bar checked for it, and a
    newline still wouldn't be printed.

 pscp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ad487da0d520915aaad114921636be1ed6a4f366
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=ad487da0d520915aaad114921636be1ed6a4f366;hp=dcb93d60e6e8d5d7aa6fef3d981fa16a7a2c96d0
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Oct 2 18:32:08 2018 +0100

    pscp: remove redundant progress bar indicator.
    
    Another mistake in commit 54b300f15 was to introduce a new flag
    'progress_bar_displayed', when in fact we were already storing an
    indication of whether a set of live transfer statistics were currently
    on the display, in the form of prev_stats_len (which is also used to
    make sure each stats display overwrites all of the previous one).
    
    Removed that redundancy, and while I'm at it, renamed the new
    abandon_progress_bar() to match the rest of the code's general
    convention of calling that status display 'statistics' or 'transfer
    statistics' rather than a 'progress bar'.

 pscp.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

commit 78e280a1cd8902271d3c0d82afa2fa6ed3315084
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=78e280a1cd8902271d3c0d82afa2fa6ed3315084;hp=ad487da0d520915aaad114921636be1ed6a4f366
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Oct 2 18:34:38 2018 +0100

    pscp: remove a relic of GUI feedback mode.
    
    GUI feedback mode was last seen in 2006 (removed in commit 33b7caa59),
    so quite what a conditioned-out piece of online help text for it was
    doing still around here 12 years later, I have no idea.
    
    (Especially since it had been under #if 0 since 2001, and also since
    then its containing source file had ceased to be Windows-only so it
    would have been extra-wrong to reinstate it.)

 pscp.c | 11 -----------
 1 file changed, 11 deletions(-)

commit 72a8c8c471131c76633ab3f252a38d78b7a46388
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=72a8c8c471131c76633ab3f252a38d78b7a46388;hp=78e280a1cd8902271d3c0d82afa2fa6ed3315084
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Oct 2 18:37:32 2018 +0100

    ssh2 conn: don't accept user input until mainchan is ready.
    
    s->want_user_input is set and unset in response to fluctuations of the
    main channel's available SSH window size. But that means it can become
    TRUE before a command has been successfully started, which we don't
    want, because pscp.c uses backend_sendok() to determine when it's safe
    to check the flag that tells it whether to speak the SFTP or SCP1
    protocol. So we want to ensure we never return true from that backend
    method until we know which command we're running.

 ssh2connection.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)