Tartarus CVS: putty: jacob

[tartarus-commits at lists.tartarus.org]

CVS Root:       /usr/data/cvs
Module:         putty
Changes by:     jacob
Date:           Sun Jul 25 2004  15:00:29 BST

Log message:
Fix for `psftp-pscp-ignore-load': Default Settings is now loaded
before "-load" is processed so that it doesn't clobber it.
I've also changed the semantics of "-load" slightly for PSCP, PSFTP,
and Plink: if it's specified at all, it overrides (disables) the
implicit loading of session details based on a supplied hostname
elsewhere (on the grounds that the user is more likely to want the
"-load" session than the implicit session). (PuTTY itself doesn't do
implicit loading at all, so I haven't changed it.)
This means that all the PuTTY tools' behaviour is now consistent iff
"-load" is specified (otherwise, some tools have implicit-session, and
others don't).
However, I've not documented this behaviour, as there's a good chance
it will be swept away if and when we get round to sorting out how we
deal with settings from multiple sources. It's intended as a "do
something sensible" change.

Modified files:
    .               : cmdline.c plink.c psftp.c putty.h scp.c
    unix            : uxplink.c

Links:
http://cvs.tartarus.org//putty/cmdline.c.diff?r1=1.15&r2=1.16
http://cvs.tartarus.org//putty/plink.c.diff?r1=1.85&r2=1.86
http://cvs.tartarus.org//putty/psftp.c.diff?r1=1.76&r2=1.77
http://cvs.tartarus.org//putty/putty.h.diff?r1=1.227&r2=1.228
http://cvs.tartarus.org//putty/scp.c.diff?r1=1.121&r2=1.122
http://cvs.tartarus.org//putty/unix/uxplink.c.diff?r1=1.30&r2=1.31