Don't forget to set $TERM when we spawn the pty. Of course I haven't

[u/mdw/putty] / unix / pty.c

diff --git a/unix/pty.c b/unix/pty.c
index 291247e..e5b6ad5 100644 (file)
--- a/unix/pty.c
+++ b/unix/pty.c
@@ -1,5 +1,14 @@
+#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED
+#include <features.h>
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <termios.h>
+#include <sys/ioctl.h>
 
 #include "putty.h"
 
@@ -10,12 +19,10 @@
 #define TRUE 1
 #endif
 
-static void pty_size(void);
+int pty_master_fd;
+char **pty_argv;
 
-static void c_write(char *buf, int len)
-{
-    from_backend(0, buf, len);
-}
+static void pty_size(void);
 
 /*
  * Called to set up the pty.
@@ -27,7 +34,82 @@ static void c_write(char *buf, int len)
  */
 static char *pty_init(char *host, int port, char **realhost, int nodelay)
 {
-    /* FIXME: do nothing for now */
+    int slavefd;
+    char name[FILENAME_MAX];
+    pid_t pid;
+
+    pty_master_fd = open("/dev/ptmx", O_RDWR);
+
+    if (pty_master_fd < 0) {
+       perror("/dev/ptmx: open");
+       exit(1);
+    }
+
+    if (grantpt(pty_master_fd) < 0) {
+       perror("grantpt");
+       exit(1);
+    }
+    
+    if (unlockpt(pty_master_fd) < 0) {
+       perror("unlockpt");
+       exit(1);
+    }
+
+    name[FILENAME_MAX-1] = '\0';
+    strncpy(name, ptsname(pty_master_fd), FILENAME_MAX-1);
+
+    slavefd = open(name, O_RDWR);
+    if (slavefd < 0) {
+       perror("slave pty: open");
+       exit(1);
+    }
+
+    /*
+     * Fork and execute the command.
+     */
+    pid = fork();
+    if (pid < 0) {
+       perror("fork");
+       exit(1);
+    }
+
+    if (pid == 0) {
+       int i;
+       /*
+        * We are the child.
+        */
+       close(pty_master_fd);
+       close(0);
+       close(1);
+       close(2);
+       fcntl(slavefd, F_SETFD, 0);    /* don't close on exec */
+       dup2(slavefd, 0);
+       dup2(slavefd, 1);
+       dup2(slavefd, 2);
+       setsid();
+       setpgrp();
+       tcsetpgrp(slavefd, getpgrp());
+       /* Close everything _else_, for tidiness. */
+       for (i = 3; i < 1024; i++)
+           close(i);
+       {
+           char term_env_var[10 + sizeof(cfg.termtype)];
+           sprintf(term_env_var, "TERM=%s", cfg.termtype);
+           putenv(term_env_var);
+       }
+       if (pty_argv)
+           execvp(pty_argv[0], pty_argv);
+       else
+           execl(getenv("SHELL"), getenv("SHELL"), NULL);
+       /*
+        * If we're here, exec has gone badly foom.
+        */
+       perror("exec");
+       exit(127);
+    } else {
+       close(slavefd);
+    }
+
     return NULL;
 }
 
@@ -36,7 +118,15 @@ static char *pty_init(char *host, int port, char **realhost, int nodelay)
  */
 static int pty_send(char *buf, int len)
 {
-    c_write(buf, len);                /* FIXME: diagnostic thingy */
+    while (len > 0) {
+       int ret = write(pty_master_fd, buf, len);
+       if (ret < 0) {
+           perror("write pty master");
+           exit(1);
+       }
+       buf += ret;
+       len -= ret;
+    }
     return 0;
 }
 
@@ -53,7 +143,11 @@ static int pty_sendbuffer(void)
  */
 static void pty_size(void)
 {
-    /* FIXME: will need to do TIOCSWINSZ or whatever. */
+    struct winsize size;
+
+    size.ws_row = (unsigned short)rows;
+    size.ws_col = (unsigned short)cols;
+    ioctl(pty_master_fd, TIOCSWINSZ, (void *)&size);
     return;
 }