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.

unix/columns.c

@@ -1,5 +1,5 @@
 /*
- * gtkcols.c - implementation of the `Columns' GTK layout container.
+ * columns.c - implementation of the `Columns' GTK layout container.
  */
 
 #include <assert.h>

unix/config-gtk.c

@@ -1,5 +1,5 @@
 /*
- * gtkcfg.c - the GTK-specific parts of the PuTTY configuration
+ * config-gtk.c - the GTK-specific parts of the PuTTY configuration
  * box.
  */
 

unix/config-unix.c

@@ -1,5 +1,5 @@
 /*
- * uxcfg.c - the Unix-specific parts of the PuTTY configuration
+ * config-unix.c - the Unix-specific parts of the PuTTY configuration
  * box.
  */
 

unix/console.c

@@ -1,6 +1,6 @@
 /*
- * uxcons.c: various interactive-prompt routines shared between the
- * Unix console PuTTY tools
+ * unix/console.c: various interactive-prompt routines shared between
+ * the Unix console PuTTY tools
  */
 
 #include <stdio.h>

unix/dialog.c

@@ -1,5 +1,5 @@
 /*
- * gtkdlg.c - GTK implementation of the PuTTY configuration box.
+ * dialog.c - GTK implementation of the PuTTY configuration box.
  */
 
 #include <assert.h>
@@ -1787,7 +1787,7 @@ static void filefont_clicked(GtkButton *button, gpointer data)
 #else /* !GTK_CHECK_VERSION(2,0,0) */
 
         /*
-         * Use the unifontsel code provided in gtkfont.c.
+         * Use the unifontsel code provided in unifont.c.
          */
 
         unifontsel *fontsel = unifontsel_new("Select a font");

unix/fd-socket.c

@@ -1,5 +1,5 @@
 /*
- * uxfdsock.c: implementation of Socket that just talks to two
+ * fd-socket.c: implementation of Socket that just talks to two
  * existing input and output file descriptors.
  */
 

unix/gtk-common.c

@@ -1,5 +1,5 @@
 /*
- * gtkcomm.c: machinery in the GTK front end which is common to all
+ * gtk-common.c: machinery in the GTK front end which is common to all
  * programs that run a session in a terminal window, and also common
  * across all _sessions_ rather than specific to one session. (Timers,
  * uxsel etc.)

unix/keygen-noise.c

@@ -1,5 +1,5 @@
 /*
- * uxgen.c: Unix implementation of get_heavy_noise() from cmdgen.c.
+ * keygen-noise.c: Unix implementation of get_heavy_noise() from cmdgen.c.
  */
 
 #include <stdio.h>

unix/local-proxy.c

@@ -1,5 +1,5 @@
 /*
- * uxproxy.c: Unix implementation of platform_new_connection(),
+ * local-proxy.c: Unix implementation of platform_new_connection(),
  * supporting an OpenSSH-like proxy command.
  */
 

unix/main-gtk-application.c

@@ -1,6 +1,7 @@
 /*
- * gtkapp.c: a top-level front end to GUI PuTTY and pterm, using
- * GtkApplication. Suitable for OS X. Currently unfinished.
+ * main-gtk-application.c: a top-level front end to GUI PuTTY and
+ * pterm, using GtkApplication. Suitable for OS X. Currently
+ * unfinished.
  *
  * (You could run it on ordinary Linux GTK too, in principle, but I
  * don't think it would be particularly useful to do so, even once

unix/main-gtk-simple.c

@@ -1,7 +1,7 @@
 /*
- * gtkmain.c: the common main-program code between the straight-up
- * Unix PuTTY and pterm, which they do not share with the
- * multi-session gtkapp.c.
+ * main-gtk-simple.c: the common main-program code between the
+ * straight-up Unix PuTTY and pterm, which they do not share with the
+ * multi-session main-gtk-application.c.
  */
 
 #define _GNU_SOURCE

unix/no-gtk.c

@@ -1,5 +1,5 @@
 /*
- * uxnogtk.c: link into non-GUI Unix programs so that they can tell
+ * no-gtk.c: link into non-GUI Unix programs so that they can tell
  * buildinfo about a lack of GTK.
  */
 

unix/pageant.c

@@ -90,7 +90,7 @@ static int make_pipe_to_askpass(const char *msg)
         cloexec(pipefds[1]);
 
         /*
-         * See comment in fork_and_exec_self() in gtkmain.c.
+         * See comment in fork_and_exec_self() in main-gtk-simple.c.
          */
         execv("/proc/self/exe", (char **)args);
         execvp(progname, (char **)args);

unix/platform.h

@@ -143,7 +143,7 @@ unsigned long getticks(void);
 #define NAMED_CLIPBOARDS
 #endif
 
-/* The per-session frontend structure managed by gtkwin.c */
+/* The per-session frontend structure managed by window.c */
 typedef struct GtkFrontend GtkFrontend;
 
 /* Callback when a dialog box finishes, and a no-op implementation of it */
@@ -154,7 +154,7 @@ void trivial_post_dialog_fn(void *vctx, int result);
 void initial_config_box(Conf *conf, post_dialog_fn_t after, void *afterctx);
 void new_session_window(Conf *conf, const char *geometry_string);
 
-/* Defined in gtkmain.c */
+/* Defined in main-gtk-*.c */
 void launch_duplicate_session(Conf *conf);
 void launch_new_session(void);
 void launch_saved_session(const char *str);
@@ -166,10 +166,11 @@ GtkWidget *make_gtk_toplevel_window(GtkFrontend *frontend);
 
 const struct BackendVtable *select_backend(Conf *conf);
 
-/* Defined in gtkcomm.c */
+/* Defined in gtk-common.c */
 void gtkcomm_setup(void);
 
-/* Used to pass application-menu operations from gtkapp.c to gtkwin.c */
+/* Used to pass application-menu operations from
+ * main-gtk-application.c to window.c */
 enum MenuAction {
     MA_COPY, MA_PASTE, MA_COPY_ALL, MA_DUPLICATE_SESSION,
     MA_RESTART_SESSION, MA_CHANGE_SETTINGS, MA_CLEAR_SCROLLBACK,
@@ -184,7 +185,7 @@ extern const char *const *const main_icon[];
 extern const char *const *const cfg_icon[];
 extern const int n_main_icon, n_cfg_icon;
 
-/* Things gtkdlg.c needs from gtkwin.c */
+/* Things dialog.c needs from window.c */
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
 enum DialogSlot {
     DIALOG_SLOT_RECONFIGURE,
@@ -202,7 +203,7 @@ void set_window_icon(GtkWidget *window, const char *const *const *icon,
 extern GdkAtom compound_text_atom;
 #endif
 
-/* Things gtkwin.c needs from gtkdlg.c */
+/* Things window.c needs from dialog.c */
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
 GtkWidget *create_config_box(const char *title, Conf *conf,
                              bool midsession, int protcfginfo,
@@ -245,16 +246,16 @@ GtkWidget *create_message_box(
     post_dialog_fn_t after, void *afterctx);
 #endif
 
-/* gtkwin.c needs this special function in xkeysym.c */
+/* window.c needs this special function in utils */
 int keysym_to_unicode(int keysym);
 
-/* Things uxstore.c needs from gtkwin.c */
+/* Things storage.c needs from window.c */
 char *x_get_default(const char *key);
 
-/* Things uxstore.c provides to gtkwin.c */
+/* Things storage.c provides to window.c */
 void provide_xrm_string(const char *string, const char *progname);
 
-/* Function that {gtkapp,gtkmain}.c needs from ux{pterm,putty}.c. Does
+/* Function that main-gtk-*.c needs from {pterm,putty}.c. Does
  * early process setup that varies between applications (e.g.
  * pty_pre_init or sk_init), and is passed a boolean by the caller
  * indicating whether this is an OS X style multi-session monolithic
@@ -283,12 +284,12 @@ extern const bool use_pty_argv;
  * OS X environment munging: this is the prefix we expect to find on
  * environment variable names that were changed by osxlaunch.
  * Extracted from the command line of the OS X pterm main binary, and
- * used in uxpty.c to restore the original environment before
+ * used in pty.c to restore the original environment before
  * launching its subprocess.
  */
 extern char *pty_osx_envrestore_prefix;
 
-/* Things provided by uxcons.c */
+/* Things provided by console.c */
 struct termios;
 void stderr_tty_init(void); /* call at startup if stderr might be a tty */
 void premsg(struct termios *);
@@ -308,12 +309,12 @@ int next_fd(int *state, int *rwx);
 uxsel_id *uxsel_input_add(int fd, int rwx);  /* returns an id */
 void uxsel_input_remove(uxsel_id *id);
 
-/* uxcfg.c */
+/* config-unix.c */
 struct controlbox;
 void unix_setup_config_box(
     struct controlbox *b, bool midsession, int protocol);
 
-/* gtkcfg.c */
+/* config-gtk.c */
 void gtk_setup_config_box(
     struct controlbox *b, bool midsession, void *window);
 
@@ -335,7 +336,7 @@ void gtk_setup_config_box(
 void (*putty_signal(int sig, void (*func)(int)))(int);
 void block_signal(int sig, bool block_it);
 
-/* uxmisc.c */
+/* utils */
 void cloexec(int);
 void noncloexec(int);
 bool nonblock(int);
@@ -351,7 +352,7 @@ bool init_ucs(struct unicode_data *ucsdata, char *line_codepage,
               bool utf8_override, int font_charset, int vtmode);
 
 /*
- * Spare functions exported directly from uxnet.c.
+ * Spare functions exported directly from network.c.
  */
 void *sk_getxdmdata(Socket *sock, int *lenp);
 int sk_net_get_fd(Socket *sock);
@@ -368,17 +369,17 @@ Socket *new_unix_listener(SockAddr *listenaddr, Plug *plug);
 } while (0)
 
 /*
- * Exports from uxser.c.
+ * Exports from serial.c.
  */
 extern const struct BackendVtable serial_backend;
 
 /*
- * uxpeer.c, wrapping getsockopt(SO_PEERCRED).
+ * peerinfo.c, wrapping getsockopt(SO_PEERCRED).
  */
 bool so_peercred(int fd, int *pid, int *uid, int *gid);
 
 /*
- * uxfdsock.c.
+ * fd-socket.c.
  */
 Socket *make_fd_socket(int infd, int outfd, int inerrfd,
                        SockAddr *addr, int port, Plug *plug);
@@ -396,7 +397,7 @@ void setup_fd_socket(Socket *s, int infd, int outfd, int inerrfd);
 #endif
 
 /*
- * uxpty.c.
+ * pty.c.
  */
 void pty_pre_init(void);    /* pty+utmp setup before dropping privilege */
 /* Pass in the argv[] for an instance of the pty backend created by
@@ -406,7 +407,7 @@ void pty_pre_init(void);    /* pty+utmp setup before dropping privilege */
 extern char **pty_argv;
 
 /*
- * gtkask.c.
+ * askpass.c.
  */
 char *gtk_askpass_main(const char *display, const char *wintitle,
                        const char *prompt, bool *success);
@@ -422,12 +423,12 @@ static inline bool sk_peer_trusted(Socket *sock)
 }
 
 /*
- * uxsftpserver.c.
+ * sftpserver.c.
  */
 extern const SftpServerVtable unix_live_sftpserver_vt;
 
 /*
- * uxpoll.c.
+ * utils/pollwrap.c.
  */
 typedef struct pollwrapper pollwrapper;
 pollwrapper *pollwrap_new(void);
@@ -446,7 +447,7 @@ static inline bool pollwrap_check_fd_rwx(pollwrapper *pw, int fd, int rwx)
 }
 
 /*
- * uxcliloop.c.
+ * cliloop.c.
  */
 typedef bool (*cliloop_pw_setup_t)(void *ctx, pollwrapper *pw);
 typedef void (*cliloop_pw_check_t)(void *ctx, pollwrapper *pw);

unix/plink.c

@@ -745,7 +745,7 @@ int main(int argc, char **argv)
                 --argc;
                 /* Explicitly pass "plink" in place of appname for
                  * error reporting purposes. appname will have been
-                 * set by be_foo.c to something more generic, probably
+                 * set by be_list.c to something more generic, probably
                  * "PuTTY". */
                 provide_xrm_string(*++argv, "plink");
             }

unix/printing.c

@@ -46,8 +46,8 @@ void printer_finish_job(printer_job *pj)
 /*
  * There's no sensible way to enumerate printers under Unix, since
  * practically any valid Unix command is a valid printer :-) So
- * these are useless stub functions, and uxcfg.c will disable the
- * drop-down list in the printer configurer.
+ * these are useless stub functions, and config-unix.c will disable
+ * the drop-down list in the printer configurer.
  */
 printer_enum *printer_start_enum(int *nprinters_ptr) {
     *nprinters_ptr = 0;

unix/pterm.c

@@ -15,7 +15,7 @@ const bool use_pty_argv = true;
 
 const unsigned cmdline_tooltype = TOOLTYPE_NONNETWORK;
 
-/* gtkwin.c will call this, and in pterm it's not needed */
+/* window.c will call this, and in pterm it's not needed */
 void noise_ultralight(NoiseSourceId id, unsigned long data) { }
 
 const struct BackendVtable *select_backend(Conf *conf)

unix/putty.c

@@ -19,7 +19,7 @@
 #include "gtkcompat.h"
 
 /*
- * Stubs to avoid uxpty.c needing to be linked in.
+ * Stubs to avoid pty.c needing to be linked in.
  */
 const bool use_pty_argv = false;
 char **pty_argv;                       /* never used */

unix/sftp.c

@@ -1,5 +1,5 @@
 /*
- * uxsftp.c: the Unix-specific parts of PSFTP and PSCP.
+ * sftp.c: the Unix-specific parts of PSFTP and PSCP.
  */
 
 #include <sys/time.h>

unix/storage.c

@@ -1,5 +1,5 @@
 /*
- * uxstore.c: Unix-specific implementation of the interface defined
+ * storage.c: Unix-specific implementation of the interface defined
  * in storage.h.
  */
 

unix/unifont.h

@@ -1,5 +1,5 @@
 /*
- * Header file for gtkfont.c. Has to be separate from unix.h
+ * Header file for unifont.c. Has to be separate from unix.h
  * because it depends on GTK data types, hence can't be included
  * from cross-platform code (which doesn't go near GTK).
  */
@@ -47,10 +47,10 @@
 #endif
 
 /*
- * Exports from gtkfont.c.
+ * Exports from unifont.c.
  */
 typedef struct UnifontVtable UnifontVtable; /* contents internal to
-                                             * gtkfont.c */
+                                             * unifont.c */
 typedef struct unifont {
     const struct UnifontVtable *vt;
     /*

unix/utils/pgp_fingerprints.c

@@ -1,7 +1,7 @@
 /*
  * Display the fingerprints of the PGP Master Keys to the user.
  *
- * (This is in its own file rather than in uxcons.c, because it's
+ * (This is in its own file rather than in console.c, because it's
  * appropriate even for Unix GUI apps.)
  */
 

unix/uxsel.c

@@ -2,10 +2,10 @@
  * uxsel.c
  *
  * This module is a sort of all-purpose interchange for file
- * descriptors. At one end it talks to uxnet.c and pty.c and
+ * descriptors. At one end it talks to network.c and pty.c and
  * anything else which might have one or more fds that need
  * select() or poll()-type things doing to them during an extended
- * program run; at the other end it talks to pterm.c or uxplink.c or
+ * program run; at the other end it talks to window.c or plink.c or
  * anything else which might have its own means of actually doing
  * those select()-type things.
  */

unix/window.c

@@ -1,5 +1,5 @@
 /*
- * gtkwin.c: the main code that runs a PuTTY terminal emulator and
+ * window.c: the main code that runs a PuTTY terminal emulator and
  * backend in a GTK window.
  */
 
@@ -4443,7 +4443,7 @@ static void compute_geom_hints(GtkFrontend *inst, GdkGeometry *geom)
 
 #if GTK_CHECK_VERSION(3,0,0)
     /*
-     * And if we're running a gtkapp.c based program and
+     * And if we're running a main-gtk-application.c based program and
      * GtkApplicationWindow has given us a menu bar inside the window,
      * then we must take that into account as well.
      *

unix/x11.c

@@ -1,5 +1,5 @@
 /*
- * ux_x11.c: fetch local auth data for X forwarding.
+ * x11.c: fetch local auth data for X forwarding.
  */
 
 #include <ctype.h>

unix/x11misc.h

@@ -7,14 +7,8 @@
 
 #ifndef NOT_X_WINDOWS
 
-/*
- * x11misc.c.
- */
+/* Defined in unix/utils */
 void x11_ignore_error(Display *disp, unsigned char errcode);
-
-/*
- * gtkmisc.c
- */
 Display *get_x11_display(void);
 
 #endif