commit e1336cc36aa4d6561dee8c755098d160ef74d3ce
author Josh Gao <jmgao@google.com> Sat Oct 24 01:43:23 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Oct 24 01:43:23 2015 +0000
tree 13710ab98435db08500c6aadbeca269dce9ed852
parent be2a63cdf89030aa8d6314339d3dce104142578b
parent 5481fae9c60eb982849b65c3476f38d8f83ac9ed

Merge "adb: Mask SIGTTIN so that I/O works when backgrounded."
am: 69ccb9532c

* commit '69ccb9532cb822685d27142a5117d881be21ab01':
  adb: Mask SIGTTIN so that I/O works when backgrounded.

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index d128df7..d996896 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -39,6 +39,7 @@
 #include <base/strings.h>
 
 #if !defined(_WIN32)
+#include <signal.h>
 #include <termios.h>
 #include <unistd.h>
 #endif
@@ -440,6 +441,14 @@
 
     adb_thread_setname("stdin reader");
 
+#ifndef __WIN32
+    // Mask SIGTTIN in case we're in a backgrounded process
+    sigset_t sigset;
+    sigemptyset(&sigset);
+    sigaddset(&sigset, SIGTTIN);
+    pthread_sigmask(SIG_BLOCK, &sigset, nullptr);
+#endif
+
     char raw_buffer[1024];
     char* buffer_ptr = raw_buffer;
     size_t buffer_size = sizeof(raw_buffer);