Reinstate the broken -e option in pterm. Also I've just worked out a

much better way of handling pty_argv which doesn't require uxpty.c
to be linked in to Unix PuTTY and PuTTYtel.

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

diff --git a/Recipe b/Recipe
index 2fd0df4..8fe9f35 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -253,9 +253,9 @@ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
 
 pterm    : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
          + uxsignal CHARSET cmdline uxpterm version time
-putty    : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_ALL uxstore
+putty    : [X] UXTERM uxmisc misc ldisc settings uxsel BE_ALL uxstore
          + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11
-puttytel : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_NOSSH
+puttytel : [X] UXTERM uxmisc misc ldisc settings uxsel BE_NOSSH
         + uxstore uxsignal CHARSET uxputty NONSSH UXMISC
 
 plink    : [U] uxplink uxcons NONSSH UXSSH BE_ALL logging UXMISC uxsignal ux_x11

diff --git a/unix/uxpterm.c b/unix/uxpterm.c
index f2956d9..50fdad9 100644 (file)
--- a/unix/uxpterm.c
+++ b/unix/uxpterm.c
@@ -10,6 +10,7 @@
 const char *const appname = "pterm";
 const int use_event_log = 0;          /* pterm doesn't need it */
 const int new_session = 0, saved_sessions = 0;   /* or these */
+const int use_pty_argv = TRUE;
 
 Backend *select_backend(Config *cfg)
 {

diff --git a/unix/uxpty.c b/unix/uxpty.c
index 8a3dbe6..f91dc71 100644 (file)
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -171,7 +171,6 @@ static struct utmp utmp_entry;
  * make sense outside a one-pty-per-process setup.
  */
 char **pty_argv;
-int use_pty_argv;
 
 static void pty_close(Pty pty);
 

diff --git a/unix/uxputty.c b/unix/uxputty.c
index 58ae24d..0abc1ff 100644 (file)
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -13,6 +13,12 @@
 #include "storage.h"
 
 /*
+ * Stubs to avoid uxpty.c needing to be linked in.
+ */
+const int use_pty_argv = FALSE;
+char **pty_argv;                      /* never used */
+
+/*
  * Clean up and exit.
  */
 void cleanup_exit(int code)