Rename most of the platform source files.

This gets rid of all those annoying 'win', 'ux' and 'gtk' prefixes
which made filenames annoying to type and to tab-complete. Also, as
with my other recent renaming sprees, I've taken the opportunity to
expand and clarify some of the names so that they're not such cryptic
abbreviations.

unix/CMakeLists.txt

@@ -19,38 +19,41 @@ add_sources_from_current_dir(utils
   utils/signal.c
   utils/x11_ignore_error.c
   # Compiled icon pixmap files
-  xpmpucfg.c xpmputty.c xpmptcfg.c xpmpterm.c
+  putty-xpm.c
+  putty-config-xpm.c
+  pterm-xpm.c
+  pterm-config-xpm.c
   # We want the ISO C implementation of ltime(), because we don't have
   # a local better alternative
   ../utils/ltime.c)
 add_sources_from_current_dir(eventloop
-  uxcliloop.c uxsel.c)
+  cliloop.c uxsel.c)
 add_sources_from_current_dir(console
-  uxcons.c)
+  console.c)
 add_sources_from_current_dir(settings
-  uxstore.c)
+  storage.c)
 add_sources_from_current_dir(network
-  uxnet.c uxfdsock.c uxagentsock.c uxpeer.c uxproxy.c ux_x11.c)
+  network.c fd-socket.c agent-socket.c peerinfo.c local-proxy.c x11.c)
 add_sources_from_current_dir(sshcommon
-  uxnoise.c)
+  noise.c)
 add_sources_from_current_dir(sshclient
-  uxgss.c uxagentc.c uxshare.c)
+  gss.c agent-client.c sharing.c)
 add_sources_from_current_dir(sshserver
-  uxsftpserver.c procnet.c)
+  sftpserver.c procnet.c)
 add_sources_from_current_dir(sftpclient
-  uxsftp.c)
+  sftp.c)
 add_sources_from_current_dir(otherbackends
-  uxser.c)
+  serial.c)
 add_sources_from_current_dir(agent
-  uxagentc.c)
+  agent-client.c)
 
 add_executable(fuzzterm
   ${CMAKE_SOURCE_DIR}/fuzzterm.c
   ${CMAKE_SOURCE_DIR}/be_none.c
   ${CMAKE_SOURCE_DIR}/logging.c
   ${CMAKE_SOURCE_DIR}/noprint.c
-  uxucs.c
+  unicode.c
-  uxnogtk.c)
+  no-gtk.c)
 add_dependencies(fuzzterm generated_licence_h)
 target_link_libraries(fuzzterm
   guiterminal eventloop charset settings utils)
@@ -59,9 +62,9 @@ add_executable(osxlaunch
   osxlaunch.c)
 
 add_executable(plink
-  uxplink.c
+  plink.c
   ${CMAKE_SOURCE_DIR}/be_all_s.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(plink
   eventloop noterminal console sshclient otherbackends settings network crypto
   utils)
@@ -70,7 +73,7 @@ installed_program(plink)
 add_executable(pscp
   ${CMAKE_SOURCE_DIR}/pscp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(pscp
   sftpclient eventloop console sshclient settings network crypto utils)
 installed_program(pscp)
@@ -78,38 +81,38 @@ installed_program(pscp)
 add_executable(psftp
   ${CMAKE_SOURCE_DIR}/psftp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(psftp
   sftpclient eventloop console sshclient settings network crypto utils)
 installed_program(psftp)
 
 add_executable(psocks
-  uxsocks.c
+  psocks.c
   ${CMAKE_SOURCE_DIR}/psocks.c
   ${CMAKE_SOURCE_DIR}/norand.c
   ${CMAKE_SOURCE_DIR}/nocproxy.c
   ${CMAKE_SOURCE_DIR}/ssh/portfwd.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(psocks
   eventloop console network utils)
 
 add_executable(psusan
-  uxpsusan.c
+  psusan.c
   ${CMAKE_SOURCE_DIR}/be_none.c
   ${CMAKE_SOURCE_DIR}/nogss.c
   ${CMAKE_SOURCE_DIR}/ssh/scpserver.c
-  uxnogtk.c
+  no-gtk.c
-  uxpty.c)
+  pty.c)
 target_link_libraries(psusan
   eventloop sshserver keygen settings network crypto utils)
 installed_program(psusan)
 
 add_library(puttygen-common OBJECT
   ${CMAKE_SOURCE_DIR}/notiming.c
-  uxgen.c
+  keygen-noise.c
-  uxnogtk.c
+  no-gtk.c
-  uxnoise.c
+  noise.c
-  uxstore.c
+  storage.c
   ${CMAKE_SOURCE_DIR}/sshpubk.c
   ${CMAKE_SOURCE_DIR}/sshrand.c)
 
@@ -134,11 +137,11 @@ add_executable(testzlib
 target_link_libraries(testzlib utils)
 
 add_executable(uppity
-  uxserver.c
+  uppity.c
   ${CMAKE_SOURCE_DIR}/be_none.c
   ${CMAKE_SOURCE_DIR}/ssh/scpserver.c
-  uxnogtk.c
+  no-gtk.c
-  uxpty.c
+  pty.c
   ${CMAKE_SOURCE_DIR}/nogss.c)
 target_link_libraries(uppity
   eventloop sshserver keygen settings network crypto utils)
@@ -151,19 +154,19 @@ if(GTK_FOUND)
     utils/get_x11_display.c
     utils/our_dialog.c
     utils/string_width.c
-    gtkcols.c)
+    columns.c)
   add_sources_from_current_dir(guiterminal
-    gtkwin.c gtkfont.c gtkdlg.c gtkcfg.c gtkcomm.c uxcfg.c uxucs.c uxprint.c)
+    window.c unifont.c dialog.c config-gtk.c gtk-common.c config-unix.c unicode.c printing.c)
-  add_dependencies(guiterminal generated_licence_h) # gtkdlg.c uses licence.h
+  add_dependencies(guiterminal generated_licence_h) # dialog.c uses licence.h
 
   add_executable(pageant
-    uxpgnt.c
+    pageant.c
     ${CMAKE_SOURCE_DIR}/be_misc.c
     ${CMAKE_SOURCE_DIR}/be_none.c
     ${CMAKE_SOURCE_DIR}/nogss.c
-    gtkask.c
+    askpass.c
-    ux_x11.c
+    x11.c
-    uxnoise.c
+    noise.c
     ${CMAKE_SOURCE_DIR}/ssh/x11fwd.c)
   target_link_libraries(pageant
     eventloop console agent settings network crypto utils
@@ -171,30 +174,30 @@ if(GTK_FOUND)
   installed_program(pageant)
 
   add_executable(pterm
-    uxpterm.c
+    pterm.c
-    gtkmain.c
+    main-gtk-simple.c
     ${CMAKE_SOURCE_DIR}/be_none.c
     ${CMAKE_SOURCE_DIR}/nogss.c
-    uxpty.c)
+    pty.c)
   target_link_libraries(pterm
     guiterminal eventloop settings charset utils
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
   installed_program(pterm)
 
   add_executable(ptermapp
-    uxpterm.c
+    pterm.c
-    gtkapp.c
+    main-gtk-application.c
     ${CMAKE_SOURCE_DIR}/nocmdline.c
     ${CMAKE_SOURCE_DIR}/be_none.c
     ${CMAKE_SOURCE_DIR}/nogss.c
-    uxpty.c)
+    pty.c)
   target_link_libraries(ptermapp
     guiterminal eventloop settings charset utils
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
 
   add_executable(putty
-    uxputty.c
+    putty.c
-    gtkmain.c
+    main-gtk-simple.c
     ${CMAKE_SOURCE_DIR}/be_all_s.c)
   target_link_libraries(putty
     guiterminal eventloop sshclient otherbackends settings
@@ -205,8 +208,8 @@ if(GTK_FOUND)
   installed_program(putty)
 
   add_executable(puttyapp
-    uxputty.c
+    putty.c
-    gtkapp.c
+    main-gtk-application.c
     ${CMAKE_SOURCE_DIR}/nocmdline.c
     ${CMAKE_SOURCE_DIR}/be_all_s.c)
   target_link_libraries(puttyapp
@@ -215,8 +218,8 @@ if(GTK_FOUND)
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
 
   add_executable(puttytel
-    uxputty.c
+    putty.c
-    gtkmain.c
+    main-gtk-simple.c
     ${CMAKE_SOURCE_DIR}/be_nos_s.c
     ${CMAKE_SOURCE_DIR}/nogss.c
     ${CMAKE_SOURCE_DIR}/norand.c

unix/askpass.c

@@ -15,7 +15,7 @@
 #endif
 
 #include "defs.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkcompat.h"
 #include "gtkmisc.h"
 

unix/columns.c

@@ -6,7 +6,7 @@
 #include <gtk/gtk.h>
 #include "defs.h"
 #include "gtkcompat.h"
-#include "gtkcols.h"
+#include "columns.h"
 
 #if GTK_CHECK_VERSION(2,0,0)
 /* The "focus" method lives in GtkWidget from GTK 2 onwards, but it

unix/columns.h

@@ -1,5 +1,5 @@
 /*
- * gtkcols.h - header file for a columns-based widget container
+ * columns.h - header file for a columns-based widget container
  * capable of supporting the PuTTY portable dialog box layout
  * mechanism.
  */

unix/dialog.c

@@ -16,8 +16,8 @@
 
 #include "putty.h"
 #include "gtkcompat.h"
-#include "gtkcols.h"
+#include "columns.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS

unix/gtk-common.c

@@ -34,7 +34,7 @@
 #include "putty.h"
 #include "terminal.h"
 #include "gtkcompat.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS

unix/main-gtk-simple.c

@@ -33,7 +33,7 @@
 #include "putty.h"
 #include "terminal.h"
 #include "gtkcompat.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS

unix/unifont.c

@@ -21,7 +21,7 @@
 #define MAY_REFER_TO_GTK_IN_HEADERS
 
 #include "putty.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkcompat.h"
 #include "gtkmisc.h"
 #include "tree234.h"

unix/window.c

@@ -32,7 +32,7 @@
 #include "putty.h"
 #include "terminal.h"
 #include "gtkcompat.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS

windows/CMakeLists.txt

@@ -2,7 +2,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 add_sources_from_current_dir(utils
   utils/arm_arch_queries.c
-  utils/capi.c
+  utils/cryptoapi.c
   utils/defaults.c
   utils/dll_hijacking_protection.c
   utils/dputs.c
@@ -26,38 +26,38 @@ add_sources_from_current_dir(utils
   utils/split_into_argv.c
   utils/version.c
   utils/win_strerror.c
-  winucs.c)
+  unicode.c)
 if(NOT HAVE_STRTOUMAX)
   add_sources_from_current_dir(utils utils/strtoumax.c)
 endif()
 add_sources_from_current_dir(eventloop
-  wincliloop.c winhandl.c)
+  cliloop.c handle-io.c)
 add_sources_from_current_dir(console
-  winselcli.c winnohlp.c wincons.c)
+  select-cli.c nohelp.c console.c)
 add_sources_from_current_dir(settings
-  winstore.c)
+  storage.c)
 add_sources_from_current_dir(network
-  winnet.c winhsock.c winnpc.c winnps.c winproxy.c winx11.c)
+  network.c handle-socket.c named-pipe-client.c named-pipe-server.c local-proxy.c x11.c)
 add_sources_from_current_dir(sshcommon
-  winnoise.c)
+  noise.c)
 add_sources_from_current_dir(sshclient
-  winpgntc.c wingss.c winshare.c)
+  agent-client.c gss.c sharing.c)
 add_sources_from_current_dir(sftpclient
-  winsftp.c)
+  sftp.c)
 add_sources_from_current_dir(otherbackends
-  winser.c)
+  serial.c)
 add_sources_from_current_dir(agent
-  winpgntc.c)
+  agent-client.c)
 add_sources_from_current_dir(guiterminal
-  windlg.c winctrls.c wincfg.c winprint.c winjump.c sizetip.c)
+  dialog.c controls.c config.c printing.c jump-list.c sizetip.c)
-add_dependencies(guiterminal generated_licence_h) # windlg.c uses licence.h
+add_dependencies(guiterminal generated_licence_h) # dialog.c uses licence.h
 
 add_library(guimisc STATIC
-  winselgui.c)
+  select-gui.c)
 
 add_executable(pageant
-  winpgnt.c
+  pageant.c
-  winhelp.c
+  help.c
   pageant.rc)
 add_dependencies(pageant generated_licence_h)
 target_link_libraries(pageant
@@ -69,10 +69,10 @@ set_target_properties(pageant PROPERTIES
 installed_program(pageant)
 
 add_executable(plink
-  winplink.c
+  plink.c
   ${CMAKE_SOURCE_DIR}/be_all_s.c
-  winnojmp.c
+  no-jump-list.c
-  winnohlp.c
+  nohelp.c
   plink.rc)
 add_dependencies(plink generated_licence_h)
 target_link_libraries(plink
@@ -84,8 +84,8 @@ installed_program(plink)
 add_executable(pscp
   ${CMAKE_SOURCE_DIR}/pscp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  winnojmp.c
+  no-jump-list.c
-  winnohlp.c
+  nohelp.c
   pscp.rc)
 add_dependencies(pscp generated_licence_h)
 target_link_libraries(pscp
@@ -96,8 +96,8 @@ installed_program(pscp)
 add_executable(psftp
   ${CMAKE_SOURCE_DIR}/psftp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  winnojmp.c
+  no-jump-list.c
-  winnohlp.c
+  nohelp.c
   psftp.rc)
 add_dependencies(psftp generated_licence_h)
 target_link_libraries(psftp
@@ -106,8 +106,8 @@ target_link_libraries(psftp
 installed_program(psftp)
 
 add_executable(psocks
-  winsocks.c
+  psocks.c
-  winnohlp.c
+  nohelp.c
   ${CMAKE_SOURCE_DIR}/psocks.c
   ${CMAKE_SOURCE_DIR}/norand.c
   ${CMAKE_SOURCE_DIR}/nocproxy.c
@@ -118,7 +118,7 @@ target_link_libraries(psocks
 
 add_executable(putty
   window.c
-  winhelp.c
+  help.c
   ${CMAKE_SOURCE_DIR}/be_all_s.c
   putty.rc)
 add_dependencies(putty generated_licence_h)
@@ -133,7 +133,7 @@ installed_program(putty)
 
 add_executable(puttytel
   window.c
-  winhelp.c
+  help.c
   ${CMAKE_SOURCE_DIR}/be_nos_s.c
   ${CMAKE_SOURCE_DIR}/nogss.c
   ${CMAKE_SOURCE_DIR}/norand.c
@@ -149,15 +149,15 @@ set_target_properties(puttytel PROPERTIES
 installed_program(puttytel)
 
 add_executable(puttygen
-  winpgen.c
+  puttygen.c
   ${CMAKE_SOURCE_DIR}/notiming.c
-  winnoise.c
+  noise.c
-  winnojmp.c
+  no-jump-list.c
-  winstore.c
+  storage.c
-  winhelp.c
+  help.c
   ${CMAKE_SOURCE_DIR}/sshpubk.c
   ${CMAKE_SOURCE_DIR}/sshrand.c
-  winctrls.c
+  controls.c
   puttygen.rc)
 add_dependencies(puttygen generated_licence_h)
 target_link_libraries(puttygen

windows/agent-client.c

@@ -9,8 +9,8 @@
 #include "putty.h"
 #include "pageant.h" /* for AGENT_MAX_MSGLEN */
 
-#include "winsecur.h"
+#include "security-api.h"
-#include "wincapi.h"
+#include "cryptoapi.h"
 
 #define AGENT_COPYDATA_ID 0x804e50ba   /* random goop */
 

windows/cryptoapi.h

@@ -1,5 +1,5 @@
 /*
- * wincapi.h: Windows Crypto API functions defined in wincapi.c that
+ * cryptoapi.h: Windows Crypto API functions defined in PuTTY that
  * use the crypt32 library. Also centralises the machinery for
  * dynamically loading that library, and our own functions using that
  * in turn.

windows/dialog.c

@@ -11,8 +11,8 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "win_res.h"
+#include "putty-rc.h"
-#include "winseat.h"
+#include "win-gui-seat.h"
 #include "storage.h"
 #include "dialog.h"
 #include "licence.h"

windows/help.c

@@ -8,7 +8,7 @@
 #include <assert.h>
 
 #include "putty.h"
-#include "win_res.h"
+#include "putty-rc.h"
 
 #ifdef NO_HTMLHELP
 

windows/help.h

@@ -1,5 +1,5 @@
 /*
- * winhelp.h - define Windows Help context names.
+ * help.h - define Windows Help context names.
  * Each definition is simply a string which matches up with the
  * section names in the Halibut source, and is used for HTML Help.
  */

windows/help.rc2

@@ -1,4 +1,4 @@
-#include "win_res.h"
+#include "putty-rc.h"
 
 #ifdef EMBEDDED_CHM_FILE
 ID_CUSTOM_CHMFILE TYPE_CUSTOM_CHMFILE EMBEDDED_CHM_FILE

windows/named-pipe-client.c

@@ -11,7 +11,7 @@
 #include "proxy.h"
 #include "ssh.h"
 
-#include "winsecur.h"
+#include "security-api.h"
 
 HANDLE connect_to_named_pipe(const char *pipename, char **err)
 {

windows/named-pipe-server.c

@@ -11,7 +11,7 @@
 #include "proxy.h"
 #include "ssh.h"
 
-#include "winsecur.h"
+#include "security-api.h"
 
 typedef struct NamedPipeServerSocket {
     /* Parameters for (repeated) creation of named pipe objects */

windows/pageant.c

@@ -13,8 +13,8 @@
 #include "ssh.h"
 #include "misc.h"
 #include "tree234.h"
-#include "winsecur.h"
+#include "security-api.h"
-#include "wincapi.h"
+#include "cryptoapi.h"
 #include "pageant.h"
 #include "licence.h"
 #include "pageant-rc.h"

windows/pageant.rc

@@ -9,7 +9,7 @@
 
 #include "pageant-rc.h"
 
-#include "winhelp.rc2"
+#include "help.rc2"
 
 IDI_MAINICON ICON "pageant.ico"
 IDI_TRAYICON ICON "pageants.ico"

windows/platform.h

@@ -25,7 +25,7 @@
 
 #include "tree234.h"
 
-#include "winhelp.h"
+#include "help.h"
 
 #if defined _M_IX86 || defined _M_AMD64
 #define BUILDINFO_PLATFORM "x86 Windows"

windows/plink.c

@@ -10,7 +10,7 @@
 #include "putty.h"
 #include "storage.h"
 #include "tree234.h"
-#include "winsecur.h"
+#include "security-api.h"
 
 void cmdline_error(const char *fmt, ...)
 {

windows/putty-common.rc2

@@ -13,7 +13,7 @@
  * from it (which happens if the extension is '.h').
  */
 
-#include "win_res.h"
+#include "putty-rc.h"
 
 IDI_MAINICON ICON "putty.ico"
 

windows/putty-rc.h

@@ -1,5 +1,5 @@
 /*
- * win_res.h - constants shared between win_res.rc2 and the C code.
+ * putty-rc.h - constants shared between putty-common.rc2 and the C code.
  */
 
 #ifndef PUTTY_WIN_RES_H

windows/putty.rc

@@ -3,8 +3,8 @@
 #define APPNAME "PuTTY"
 #define APPDESC "SSH, Telnet, Rlogin, and SUPDUP client"
 
-#include "winhelp.rc2"
+#include "help.rc2"
-#include "win_res.rc2"
+#include "putty-common.rc2"
 
 #ifndef NO_MANIFESTS
 1 RT_MANIFEST "putty.mft"

windows/puttygen.c

@@ -11,7 +11,7 @@
 #include "ssh.h"
 #include "sshkeygen.h"
 #include "licence.h"
-#include "winsecur.h"
+#include "security-api.h"
 #include "puttygen-rc.h"
 
 #include <commctrl.h>

windows/puttygen.rc

@@ -7,7 +7,7 @@
 #define APPNAME "PuTTYgen"
 #define APPDESC "PuTTY SSH key generation utility"
 
-#include "winhelp.rc2"
+#include "help.rc2"
 #include "puttygen-rc.h"
 
 200 ICON "puttygen.ico"

windows/puttytel.rc

@@ -3,8 +3,8 @@
 #define APPNAME "PuTTYtel"
 #define APPDESC "Telnet and Rlogin client"
 
-#include "winhelp.rc2"
+#include "help.rc2"
-#include "win_res.rc2"
+#include "putty-common.rc2"
 
 #ifndef NO_MANIFESTS
 1 RT_MANIFEST "puttytel.mft"

windows/security-api.h

@@ -1,5 +1,5 @@
 /*
- * winsecur.h: some miscellaneous security-related helper functions,
+ * security-api.h: some miscellaneous security-related helper functions,
  * defined in winsecur.c, that use the advapi32 library. Also
  * centralises the machinery for dynamically loading that library.
  */

windows/sftp.c

@@ -10,7 +10,7 @@
 #include "putty.h"
 #include "psftp.h"
 #include "ssh.h"
-#include "winsecur.h"
+#include "security-api.h"
 
 int filexfer_get_userpass_input(Seat *seat, prompts_t *p, bufchain *input)
 {

windows/sharing.c

@@ -11,8 +11,8 @@
 #include "proxy.h"
 #include "ssh.h"
 
-#include "wincapi.h"
+#include "cryptoapi.h"
-#include "winsecur.h"
+#include "security-api.h"
 
 #define CONNSHARE_PIPE_PREFIX "\\\\.\\pipe\\putty-connshare"
 #define CONNSHARE_MUTEX_PREFIX "Local\\putty-connshare-mutex"

windows/utils/cryptoapi.c

@@ -1,5 +1,5 @@
 /*
- * windows/utils/capi.c: implementation of wincapi.h.
+ * windows/utils/cryptoapi.c: implementation of cryptoapi.h.
  */
 
 #include "putty.h"
@@ -7,7 +7,7 @@
 #include "putty.h"
 #include "ssh.h"
 
-#include "wincapi.h"
+#include "cryptoapi.h"
 
 DEF_WINDOWS_FUNCTION(CryptProtectMemory);
 

windows/utils/security.c

@@ -1,5 +1,5 @@
 /*
- * windows/utils/security.c: implementation of winsecur.h.
+ * windows/utils/security.c: implementation of security-api.h.
  */
 
 #include <stdio.h>
@@ -7,7 +7,7 @@
 
 #include "putty.h"
 
-#include "winsecur.h"
+#include "security-api.h"
 
 /* Initialised once, then kept around to reuse forever */
 static PSID worldsid, networksid, usersid;

windows/window.c

@@ -15,9 +15,9 @@
 #include "putty.h"
 #include "terminal.h"
 #include "storage.h"
-#include "win_res.h"
+#include "putty-rc.h"
-#include "winsecur.h"
+#include "security-api.h"
-#include "winseat.h"
+#include "win-gui-seat.h"
 #include "tree234.h"
 
 #ifdef NO_MULTIMON