simon-git: putty (main): Simon Tatham
Commits to Tartarus hosted VCS
tartarus-commits at lists.tartarus.org
Sat Jan 22 15:57:36 GMT 2022
TL;DR:
cadd86ac doc/CMakeLists.txt: reorganise custom targets.
e262dab6 udp.but: update description of handle-io system.
b67c01be Remove orphaned prototype of ser_setup_config_box.
81391e3f nocmdline.c: remove unused stub of cmdline_process_param.
5935c682 Update source file names in comments and docs.
b7ed5056 net_service_lookup: add missing 'const'.
57531871 Remove the prohibition on // comments.
Repository: https://git.tartarus.org/simon/putty.git
On the web: https://git.tartarus.org/?p=simon/putty.git
Branch updated: main
Committer: Simon Tatham <anakin at pobox.com>
Date: 2022-01-22 15:57:36
commit cadd86ac4993fa9fcd69827c083803e159f499b1
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=cadd86ac4993fa9fcd69827c083803e159f499b1;hp=fafad1b8f6b76abad80b8a290a39590896f9ac2f
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Jan 22 14:42:03 2022 +0000
doc/CMakeLists.txt: reorganise custom targets.
Jacob reported that on Debian buster, the command sequence
cmake $srcdir
cmake --build .
cmake --build . --target doc
would fail at the third step, with the make error "No rule to make
target 'doc/cmake_version.but', needed by 'doc/html/index.html'".
That seems odd, because the file ${VERSION_BUT} _was_ declared as a
dependency of the rule that builds doc/html/*.html, and _cmake_ knew
what rule built it (namely the custom target 'cmake_version_but'). I
suspect this is a bug in cmake 3.13, because the same command sequence
works fine with cmake 3.20.
However, it's possible to work around, by means of adding the cmake
_target name_ to the dependencies for any rule that uses that file,
instead of relying on it to map the output _file_ name to that target.
While I'm at it, I've transformed the rules that build copy.but and
licence.but in the same way, turning those too into custom targets
instead of custom commands (I've found that the former are more
generally reliable across a range of cmake versions), and including
the target names themselves as dependencies.
doc/CMakeLists.txt | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
commit e262dab642f2f11f7b64f706bb86659dabfed68f
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=e262dab642f2f11f7b64f706bb86659dabfed68f;hp=cadd86ac4993fa9fcd69827c083803e159f499b1
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Jan 22 14:52:46 2022 +0000
udp.but: update description of handle-io system.
It's been so long since Windows Plink kept its stdio subthreads in its
own main source file that I'd forgotten it had ever done so! They've
lived in a separate module for managing Windows HANDLE-based I/O for
ages. That module has recently changed its filename, but this piece of
documentation was so out of date that the old filename wasn't in there
- it was still mentioning the filename _before_ that.
doc/udp.but | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
commit b67c01be841b602faea9c3253a4d08952bd7fc0c
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=b67c01be841b602faea9c3253a4d08952bd7fc0c;hp=e262dab642f2f11f7b64f706bb86659dabfed68f
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Jan 22 15:40:28 2022 +0000
Remove orphaned prototype of ser_setup_config_box.
The serial configuration was folded back into config.c in commit
18d273fcf1eca23, but I forgot to remove the prototype in putty.h.
putty.h | 6 ------
1 file changed, 6 deletions(-)
commit 81391e3f2367df2601ccd671f2fe91bbdf1107ae
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=81391e3f2367df2601ccd671f2fe91bbdf1107ae;hp=b67c01be841b602faea9c3253a4d08952bd7fc0c
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Jan 22 15:47:22 2022 +0000
nocmdline.c: remove unused stub of cmdline_process_param.
This was needed at the time it was introduced in commit
c99338b750aed37, because uxputty.c (as was) handled its non-option
arguments directly (that was how Unix PuTTY and pterm arranged to have
different sets of them), and sometimes did it by converting them into
option arguments and feeding them to cmdline.c, so it still needed to
not fail to link when not linked against cmdline.c (for the
GtkApplication based front end).
But now the non-option argument handling is centralised into cmdline.c
itself, with a system of flags indicating which arguments a particular
tool expects. So that stub is no longer needed.
stubs/nocmdline.c | 16 ----------------
1 file changed, 16 deletions(-)
commit 5935c682884386672d9acab5e81e15aa66573c98
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=5935c682884386672d9acab5e81e15aa66573c98;hp=81391e3f2367df2601ccd671f2fe91bbdf1107ae
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Jan 22 15:38:53 2022 +0000
Update source file names in comments and docs.
Correcting a source file name in the docs just now reminded me that
I've seen a lot of outdated source file names elsewhere in the code,
due to all the reorganisation since we moved to cmake. Here's a giant
pass of trying to make them all accurate again.
charset/localenc.c | 2 +-
cmake/gitcommit.cmake | 4 ++--
crypto/blowfish.h | 2 +-
crypto/ecc-ssh.c | 4 ++--
crypto/mpint_i.h | 2 +-
doc/faq.but | 3 ++-
misc.h | 17 ++++++--------
mpint.h | 4 ++--
network.h | 4 ++--
pscp.c | 2 +-
putty.h | 30 +++++++++++++-----------
puttymem.h | 13 ++++++-----
settings.c | 6 ++---
ssh.h | 18 +++++++--------
ssh/gss.h | 2 +-
ssh/server.h | 2 +-
ssh/sesschan.c | 6 ++---
ssh/sharing.c | 25 ++++++++++----------
ssh/ssh.c | 2 +-
sshcr.h | 1 -
test/fuzzterm.c | 2 +-
unix/columns.c | 2 +-
unix/config-gtk.c | 2 +-
unix/config-unix.c | 2 +-
unix/console.c | 4 ++--
unix/dialog.c | 4 ++--
unix/fd-socket.c | 2 +-
unix/gtk-common.c | 2 +-
unix/keygen-noise.c | 2 +-
unix/local-proxy.c | 2 +-
unix/main-gtk-application.c | 5 ++--
unix/main-gtk-simple.c | 6 ++---
unix/no-gtk.c | 2 +-
unix/pageant.c | 2 +-
unix/platform.h | 49 ++++++++++++++++++++-------------------
unix/plink.c | 2 +-
unix/printing.c | 4 ++--
unix/pterm.c | 2 +-
unix/putty.c | 2 +-
unix/sftp.c | 2 +-
unix/storage.c | 2 +-
unix/unifont.h | 6 ++---
unix/utils/pgp_fingerprints.c | 2 +-
unix/uxsel.c | 4 ++--
unix/window.c | 4 ++--
unix/x11.c | 2 +-
unix/x11misc.h | 8 +------
windows/config.c | 2 +-
windows/console.c | 2 +-
windows/controls.c | 2 +-
windows/dialog.c | 2 +-
windows/handle-io.c | 2 +-
windows/handle-socket.c | 6 ++---
windows/help.c | 2 +-
windows/jump-list.c | 2 +-
windows/local-proxy.c | 4 ++--
windows/named-pipe-client.c | 10 ++++----
windows/no-jump-list.c | 4 ++--
windows/nohelp.c | 2 +-
windows/pageant.c | 5 ++--
windows/platform.h | 54 +++++++++++++++++++++----------------------
windows/security-api.h | 2 +-
windows/select-cli.c | 2 +-
windows/select-gui.c | 2 +-
windows/sftp.c | 2 +-
windows/storage.c | 2 +-
windows/win-gui-seat.h | 4 ++--
windows/x11.c | 2 +-
68 files changed, 196 insertions(+), 196 deletions(-)
commit b7ed5056e5d10090f51551da9929024b53c8f5e2
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=b7ed5056e5d10090f51551da9929024b53c8f5e2;hp=5935c682884386672d9acab5e81e15aa66573c98
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Jan 22 15:45:00 2022 +0000
net_service_lookup: add missing 'const'.
Spotted in passing while doing the filename-correction trawl.
network.h | 2 +-
unix/network.c | 2 +-
windows/network.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit 575318717b383c399dda3221d715ecaa699a2a64
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=575318717b383c399dda3221d715ecaa699a2a64;hp=b7ed5056e5d10090f51551da9929024b53c8f5e2
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Jan 22 15:53:24 2022 +0000
Remove the prohibition on // comments.
Those were forbidden so that we could still compile on pre-C99 C
compilers. But now we expect C99 everywhere (or at least most of it,
excluding the parts that MSVC never implemented and C11 made
optional), so // comments aren't forbidden any more.
Most of the comments in this code base are still old-style, but that's
now a matter of stylistic consistency rather than hard requirement.
doc/udp.but | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
More information about the tartarus-commits
mailing list