simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  5eb6c190 Extra inline helpers seat_{stdout,stderr}_pl.
  757c91e2 Extra ptrlen function, ptrlen_endswith().
  d62a369a PSCP, PSFTP: don't duplicate slashes in dir_file_cat.
  cfef137e StripCtrlChars: retarget and reset functions.
  d049f0ab Make stripctrl_string take an existing StripCtrlChars.
  d05d2e25 Revise the API for seat_stripctrl_new.
  5ca340cf terminal.c: some minor refactorings (NFC).

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:           2019-03-10 15:48:07

commit 5eb6c19047bb45f2e54b3387e65bfeb43c1b7836
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=5eb6c19047bb45f2e54b3387e65bfeb43c1b7836;hp=71a3e7da9e9b1fc0e95c9d4e02a63fb1c3eed57e
Author: Simon Tatham <anakin at pobox.com>
Date:   Thu Mar 7 10:17:08 2019 +0000

    Extra inline helpers seat_{stdout,stderr}_pl.
    
    These take a ptrlen in place of separate buffer and length arguments.
    Switched over to them in lots of places.

 putty.h          | 4 ++++
 ssh.c            | 2 +-
 ssh2userauth.c   | 2 +-
 sshcommon.c      | 2 +-
 unix/gtkwin.c    | 4 ++--
 unix/uxpty.c     | 2 +-
 windows/windlg.c | 4 ++--
 7 files changed, 12 insertions(+), 8 deletions(-)

commit 757c91e2de250b69f27843b01ab9b8c7deb5a045
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=757c91e2de250b69f27843b01ab9b8c7deb5a045;hp=5eb6c19047bb45f2e54b3387e65bfeb43c1b7836
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 9 15:47:28 2019 +0000

    Extra ptrlen function, ptrlen_endswith().
    
    Identical to ptrlen_startswith(), only the other way round.

 misc.h  |  1 +
 utils.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

commit d62a369af8b39fcf91bb88ac94dbeb54d81f7c92
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=d62a369af8b39fcf91bb88ac94dbeb54d81f7c92;hp=757c91e2de250b69f27843b01ab9b8c7deb5a045
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 9 16:15:51 2019 +0000

    PSCP, PSFTP: don't duplicate slashes in dir_file_cat.
    
    Now if a pathname ends with a slash already, we detect that (using the
    shiny new ptrlen_endswith), and don't bother putting another one in.
    
    No functional change, but this should improve the occasional error
    message, e.g. 'pscp remote:some.filename /' will now say it can't
    create /some.filename instead of //some.filename.

 unix/uxsftp.c     | 5 ++++-
 windows/winsftp.c | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

commit cfef137ea296c292bced3e45ce8c6c7658c3d4fb
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=cfef137ea296c292bced3e45ce8c6c7658c3d4fb;hp=d62a369af8b39fcf91bb88ac94dbeb54d81f7c92
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 9 15:50:38 2019 +0000

    StripCtrlChars: retarget and reset functions.
    
    stripctrl_retarget() points the StripCtrlChars at a new BinarySink, to
    avoid having to pointlessly throw it away and make a new one all the
    time.
    
    Since that probably means the same scc is going to be reused for
    processing a fresh data stream, we also don't want any character-set
    conversion state hanging over from the previous stream, so we also
    reset the state in the process. Just in case it's needed,
    stripctrl_reset() is also provided to do that operation on its own.

 misc.h      |  2 ++
 stripctrl.c | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

commit d049f0ab6c1517314057ded33908cad31bd794ed
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=d049f0ab6c1517314057ded33908cad31bd794ed;hp=cfef137ea296c292bced3e45ce8c6c7658c3d4fb
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 9 16:03:40 2019 +0000

    Make stripctrl_string take an existing StripCtrlChars.
    
    Now instead of making a StripCtrlChars just for that function call, it
    uses an existing one, pointing it at the output strbuf via
    stripctrl_retarget.
    
    This adds flexibility (now you can use the same convenient string-
    sanitising function with a StripCtrl configured in any way you like)
    and also saves pointless setting-up and tearing-down of identical sccs
    all the time.
    
    The existing call sites in PSCP and PSFTP now use a static
    StripCtrlChars instance that was made at program startup.

 misc.h      |  6 +++---
 pscp.c      | 10 +++++++---
 psftp.c     |  7 +++++--
 stripctrl.c | 10 +++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

commit d05d2e259f4074ea4f79c51647749cb0ef07b9cd
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=d05d2e259f4074ea4f79c51647749cb0ef07b9cd;hp=d049f0ab6c1517314057ded33908cad31bd794ed
Author: Simon Tatham <anakin at pobox.com>
Date:   Thu Mar 7 08:19:38 2019 +0000

    Revise the API for seat_stripctrl_new.
    
    Now instead of taking raw arguments to configure the output
    StripCtrlChars with, it takes an enumerated value giving the context
    of what's being sanitised, and allows the seat to decide what the
    output parameters for that context should be.
    
    The only context currently used is SIC_BANNER (SSH login banners).
    I've also added a not-yet-used one for keyboard-interactive prompts.

 misc.c            |  2 +-
 putty.h           | 20 ++++++++++++--------
 ssh2userauth.c    |  2 +-
 unix/gtkwin.c     |  6 +++---
 unix/uxcons.c     |  6 +++---
 windows/wincons.c |  6 +++---
 windows/window.c  |  6 +++---
 7 files changed, 26 insertions(+), 22 deletions(-)

commit 5ca340cf1d5b30bbee44ac7907b9ca4b7e07b0c3
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=5ca340cf1d5b30bbee44ac7907b9ca4b7e07b0c3;hp=d05d2e259f4074ea4f79c51647749cb0ef07b9cd
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Feb 26 18:36:20 2019 +0000

    terminal.c: some minor refactorings (NFC).
    
    I've factored out clear_line() (wipe out everything on a terminal line
    including its line attrs) and also line_cols() (determine how many
    columns are on this particular line, taking into account
    LATTR_WRAPPED2 which reduces it by one).
    
    Also, newline() and freeline() were badly named. Now they're called
    newtermline() and freetermline(), which include the full actual type
    name they deal with, and also means that now neither of them is named
    the same as a control character!

 terminal.c | 64 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 26 deletions(-)