Rename some of the more stupidly named files in the Unix back end.

Notably pterm.c, which was a sensible name right at the start but
became a misnomer as soon as I created Unix PuTTY.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5053 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Recipe b/Recipe
index 7987049..c1cdef9 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -186,7 +186,7 @@ GUITERM  = TERMINAL window windlg winctrls sizetip winucs winprint
          + winutils wincfg
 
 # Same thing on Unix.
-UXTERM   = TERMINAL pterm uxcfg gtkdlg gtkcols gtkpanel uxucs uxprint xkeysym
+UXTERM   = TERMINAL gtkwin gtkdlg gtkcols gtkpanel uxcfg uxucs uxprint xkeysym
          + timing
 
 # Non-SSH back ends (putty, puttytel, plink).
@@ -247,14 +247,14 @@ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshpubk sshaes sshsh512 import winutils puttygen.res tree234
         + notiming LIBS
 
-pterm    : [X] UXTERM uxmisc misc ldisc settings pty uxsel BE_NONE uxstore
-         + signal CHARSET cmdline ptermm version
-putty    : [X] UXTERM uxmisc misc ldisc settings pty uxsel BE_ALL uxstore
-         + signal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11
-puttytel : [X] UXTERM uxmisc misc ldisc settings pty uxsel BE_NOSSH
-        + uxstore signal CHARSET uxputty NONSSH UXMISC
+pterm    : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
+         + uxsignal CHARSET cmdline uxpterm version
+putty    : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_ALL uxstore
+         + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11
+puttytel : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_NOSSH
+        + uxstore uxsignal CHARSET uxputty NONSSH UXMISC
 
-plink    : [U] uxplink uxcons NONSSH UXSSH BE_ALL logging UXMISC signal ux_x11
+plink    : [U] uxplink uxcons NONSSH UXSSH BE_ALL logging UXMISC uxsignal ux_x11
 
 puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc

diff --git a/unix/pterm.c b/unix/gtkwin.c
similarity index 99%
rename from unix/pterm.c
rename to unix/gtkwin.c
index b1cd7d0..1b0ba4a 100644 (file)
--- a/unix/pterm.c
+++ b/unix/gtkwin.c
@@ -1,6 +1,6 @@
 /*
- * pterm - a fusion of the PuTTY terminal emulator with a Unix pty
- * back end, all running as a GTK application. Wish me luck.
+ * gtkwin.c: the main code that runs a PuTTY terminal emulator and
+ * backend in a GTK window.
  */
 
 #define _GNU_SOURCE

diff --git a/unix/ptermm.c b/unix/uxpterm.c
similarity index 100%
rename from unix/ptermm.c
rename to unix/uxpterm.c

diff --git a/unix/pty.c b/unix/uxpty.c
similarity index 100%
rename from unix/pty.c
rename to unix/uxpty.c

diff --git a/unix/signal.c b/unix/uxsignal.c
similarity index 67%
rename from unix/signal.c
rename to unix/uxsignal.c
index 9b0ad5e..e21e0e8 100644 (file)
--- a/unix/signal.c
+++ b/unix/uxsignal.c
@@ -3,14 +3,14 @@
 #include <stdlib.h>
 
 /*
- * Calling signal() is a non-portable, as it varies in meaning between
- * platforms and depending on feature macros, and has stupid semantics
- * at least some of the time.
+ * Calling signal() is non-portable, as it varies in meaning
+ * between platforms and depending on feature macros, and has
+ * stupid semantics at least some of the time.
  *
- * This function provides the same interface as the libc function, but
- * provides consistent semantics.  It assumes POSIX semantics for
- * sigaction() (so you might need to do some more work if you port to
- * something ancient like SunOS 4)
+ * This function provides the same interface as the libc function,
+ * but provides consistent semantics.  It assumes POSIX semantics
+ * for sigaction() (so you might need to do some more work if you
+ * port to something ancient like SunOS 4)
  */
 void (*putty_signal(int sig, void (*func)(int)))(int) {
     struct sigaction sa;