libuv terminal emulator support

gistfile1.diff

diff --git a/Makefile.am b/Makefile.am
index 861b632..ffdb4c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,6 +103,8 @@ libuv_la_SOURCES += src/unix/async.c \
                    src/unix/tty.c \
                    src/unix/udp.c
 
+libuv_la_LDFLAGS += -lutil
+
 endif  # WINNT
 
 TESTS = test/run-tests
@@ -115,6 +117,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
                          test/runner.c \
                          test/runner.h \
                          test/task.h \
+                         test/terminal-tester.c \
                          test/test-active.c \
                          test/test-async.c \
                          test/test-async-null-cb.c \
diff --git a/include/uv.h b/include/uv.h
index 8909e10..bf975ce 100644
--- a/include/uv.h
+++ b/include/uv.h
@@ -1638,7 +1638,10 @@ enum uv_process_flags {
    * option is only meaningful on Windows systems. On Unix it is silently
    * ignored.
    */
-  UV_PROCESS_WINDOWS_HIDE = (1 << 4)
+  UV_PROCESS_WINDOWS_HIDE = (1 << 4),
+  /*
+   */
+  UV_PROCESS_CREATE_TERMINAL = (1 << 5)
 };
 
 /*
diff --git a/src/unix/process.c b/src/unix/process.c
index 52e4eb2..6c234c3 100644
--- a/src/unix/process.c
+++ b/src/unix/process.c
@@ -44,6 +44,8 @@ extern char **environ;
 # include <grp.h>
 #endif
 
+#include <pty.h>
+
 
 static QUEUE* uv__process_queue(uv_loop_t* loop, int pid) {
   assert(pid > 0);
@@ -284,9 +286,16 @@ static void uv__process_child_init(const uv_process_options_t* options,
   int use_fd;
   int fd;
 
-  if (options->flags & UV_PROCESS_DETACHED)
+  if (options->flags & (UV_PROCESS_DETACHED | UV_PROCESS_CREATE_TERMINAL))
     setsid();
 
+  if (options->flags & UV_PROCESS_CREATE_TERMINAL){
+    if (ioctl(pipes[fd][1], TIOCSCTTY, NULL) < 0) {
+      uv__write_int(error_fd, -errno);
+      _exit(127);
+    }
+  }
+
   for (fd = 0; fd < stdio_count; fd++) {
     close_fd = pipes[fd][0];
     use_fd = pipes[fd][1];
@@ -369,6 +378,7 @@ int uv_spawn(uv_loop_t* loop,
   int signal_pipe[2] = { -1, -1 };
   int (*pipes)[2];
   int stdio_count;
+  int master, slave;
   QUEUE* q;
   ssize_t r;
   pid_t pid;
@@ -378,6 +388,7 @@ int uv_spawn(uv_loop_t* loop,
 
   assert(options->file != NULL);
   assert(!(options->flags & ~(UV_PROCESS_DETACHED |
+                              UV_PROCESS_CREATE_TERMINAL |
                               UV_PROCESS_SETGID |
                               UV_PROCESS_SETUID |
                               UV_PROCESS_WINDOWS_HIDE |
@@ -400,10 +411,24 @@ int uv_spawn(uv_loop_t* loop,
     pipes[i][1] = -1;
   }
 
-  for (i = 0; i < options->stdio_count; i++) {
-    err = uv__process_init_stdio(options->stdio + i, pipes[i]);
-    if (err)
+  if (options->flags & UV_PROCESS_CREATE_TERMINAL) {
+    assert(options->stdio_count == 3);
+    /* When emulating a terminal, we create a single master-slave pair
+     * and copy it to every slot in the 'pipes' array */
+    struct winsize wsize = {24, 80, 0, 0};
+    if (openpty(&master, &slave, NULL, NULL, &wsize) < 0)
       goto error;
+
+    for (i = 0; i < options->stdio_count; i++) {
+      pipes[i][0] = i ? dup(master) : master;
+      pipes[i][1] = i ? dup(slave) : slave;
+    }
+  } else {
+    for (i = 0; i < options->stdio_count; i++) {
+      err = uv__process_init_stdio(options->stdio + i, pipes[i]);
+      if (err)
+        goto error;
+    }
   }
 
   /* This pipe is used by the parent to wait until
diff --git a/test/run-tests.c b/test/run-tests.c
index cd50ee0..c0deffe 100644
--- a/test/run-tests.c
+++ b/test/run-tests.c
@@ -40,6 +40,7 @@ int ipc_helper(int listen_after_write);
 int ipc_helper_tcp_connection(void);
 int ipc_send_recv_helper(void);
 int stdio_over_pipes_helper(void);
+int terminal_main(int argc, char **argv);
 
 static int maybe_run_test(int argc, char **argv);
 
@@ -163,5 +164,10 @@ static int maybe_run_test(int argc, char **argv) {
   }
 #endif  /* !_WIN32 */
 
+  if (strcmp(argv[1], "spawn_helper9") == 0) {
+    terminal_main(argc - 1, argv + 1);
+    return 1;
+  }
+
   return run_test(argv[1], 0, 1);
 }
diff --git a/test/terminal-tester.c b/test/terminal-tester.c
new file mode 100644
index 0000000..46344a6
--- /dev/null
+++ b/test/terminal-tester.c
@@ -0,0 +1,70 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <uv.h>
+
+#ifdef _WIN32
+#include <windows.h>
+
+int owns_console(void)
+{
+  HWND consoleWnd = GetConsoleWindow();
+  DWORD dwProcessId;
+  GetWindowThreadProcessId(consoleWnd, &dwProcessId);
+  return GetCurrentProcessId() == dwProcessId;
+}
+
+#define fileno _fileno
+#define rchar getch
+#else
+#define rchar getchar
+#endif
+
+#define is_terminal(stream) (uv_guess_handle(fileno(stream)) == UV_TTY)
+
+
+void terminal_main(int argc, char **argv)
+{
+  int width, height;
+  uv_tty_t tty;
+  char c;
+
+  if (!is_terminal(stdin)) {
+    fprintf(stderr, "stdin is not a terminal\n");
+    exit(2);
+  }
+
+  if (!is_terminal(stdout)) {
+    fprintf(stderr, "stdout is not a terminal\n");
+    exit(2);
+  }
+
+  if (!is_terminal(stderr)) {
+    fprintf(stderr, "stderr is not a terminal\n");
+    exit(2);
+  }
+
+  uv_tty_init(uv_default_loop(), &tty, fileno(stderr), 1);
+  uv_tty_set_mode(&tty, 1);
+  printf("Ready\n");
+
+  while (c = rchar()) {
+    if (c == '\n' || c == -1) {
+      continue;
+    }
+
+    if (c == 's') {
+      uv_tty_get_winsize(&tty, &width, &height);
+      printf("Rows: %d, Columns: %d\n", width, height);
+      continue;
+    }
+
+    if (c == 'e') {
+      break;
+    }
+
+    printf("Pressed: %c\n", c);
+  }
+
+  printf("Exiting...\n");
+  uv_tty_set_mode(&tty, 0);
+}
diff --git a/test/test-list.h b/test/test-list.h
index a62c11e..c0a097e 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -189,6 +189,7 @@ TEST_DECLARE   (spawn_stdout_to_file)
 TEST_DECLARE   (spawn_stdout_and_stderr_to_file)
 TEST_DECLARE   (spawn_auto_unref)
 TEST_DECLARE   (spawn_closed_process_io)
+TEST_DECLARE   (spawn_create_terminal)
 TEST_DECLARE   (fs_poll)
 TEST_DECLARE   (fs_poll_getpath)
 TEST_DECLARE   (kill)
@@ -512,6 +513,7 @@ TASK_LIST_START
   TEST_ENTRY  (spawn_stdout_and_stderr_to_file)
   TEST_ENTRY  (spawn_auto_unref)
   TEST_ENTRY  (spawn_closed_process_io)
+  TEST_ENTRY  (spawn_create_terminal)
   TEST_ENTRY  (fs_poll)
   TEST_ENTRY  (fs_poll_getpath)
   TEST_ENTRY  (kill)
diff --git a/test/test-spawn.c b/test/test-spawn.c
index c75f1ca..ee92f9e 100644
--- a/test/test-spawn.c
+++ b/test/test-spawn.c
@@ -118,7 +118,9 @@ static void on_read(uv_stream_t* tcp, ssize_t nread, const uv_buf_t* buf) {
   if (nread > 0) {
     output_used += nread;
   } else if (nread < 0) {
-    ASSERT(nread == UV_EOF);
+    if (nread != UV_EOF)
+      fprintf(stderr, "ERROR: %s\n", uv_strerror(nread));
+    // ASSERT(nread == UV_EOF);
     uv_close((uv_handle_t*)tcp, close_cb);
   }
 }
@@ -1225,3 +1227,70 @@ TEST_IMPL(closed_fd_events) {
   return 0;
 }
 #endif  /* !_WIN32 */
+
+
+static void on_read_tty(uv_stream_t* tty, ssize_t nread, const uv_buf_t* buf) {
+  if (nread > 0) {
+    output_used += nread;
+  } else if (nread < 0) {
+    uv_close((uv_handle_t*)tty, close_cb);
+  }
+}
+
+
+TEST_IMPL(spawn_create_terminal) {
+  int r;
+  uv_pipe_t in, out, err;
+  uv_write_t write;
+  char message[] = "jke";
+  char expected[] = "Ready\n"
+                    "Pressed: j\n"
+                    "Pressed: k\n"
+                    "Exiting...";
+  uv_buf_t buf;
+  uv_stdio_container_t stdio[3];
+
+  init_process_options("spawn_helper9", exit_cb);
+
+  r = uv_pipe_init(uv_default_loop(), &in, 0);
+  ASSERT(r == 0);
+
+  r = uv_pipe_init(uv_default_loop(), &out, 0);
+  ASSERT(r == 0);
+
+  r = uv_pipe_init(uv_default_loop(), &err, 0);
+  ASSERT(r == 0);
+
+  options.stdio = stdio;
+  options.stdio[0].flags = UV_CREATE_PIPE | UV_READABLE_PIPE;
+  options.stdio[0].data.stream = (uv_stream_t*)&in;
+  options.stdio[1].flags = UV_CREATE_PIPE | UV_WRITABLE_PIPE;
+  options.stdio[1].data.stream = (uv_stream_t*)&out;
+  options.stdio[2].flags = UV_CREATE_PIPE | UV_WRITABLE_PIPE;
+  options.stdio[2].data.stream = (uv_stream_t*)&err;
+  options.stdio_count = 3;
+  options.flags = UV_PROCESS_CREATE_TERMINAL;
+
+  r = uv_spawn(uv_default_loop(), &process, &options);
+  ASSERT(r == 0);
+
+  buf = uv_buf_init(message, sizeof message);
+  r = uv_write(&write, (uv_stream_t*) &in, &buf, 1, write_cb);
+  ASSERT(r == 0);
+
+  r = uv_read_start((uv_stream_t*) &out, on_alloc, on_read_tty);
+  ASSERT(r == 0);
+
+  r = uv_read_start((uv_stream_t*) &err, on_alloc, on_read_tty);
+  ASSERT(r == 0);
+
+  r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+  ASSERT(r == 0);
+
+  ASSERT(exit_cb_called == 1);
+  ASSERT(close_cb_called == 4); /* process x 1, stdio x 3. */
+  ASSERT(strcmp(expected, output));
+
+  MAKE_VALGRIND_HAPPY();
+  return 0;
+}