Merge "Add back bionic SIGPIPE handler workaround accidentally removed in 3b51a07e478d" am: 5fb9bd50fb am: 9242133fd0
am: 9aa552faa2

Change-Id: I51f4badb23a73e826334e98e7b3e38d01df7d6c5
diff --git a/main.c b/main.c
index 61b5a7e..a2267da 100644
--- a/main.c
+++ b/main.c
@@ -213,6 +213,10 @@
   }
   *argv = getbasename(*argv);
 
+  // Bionic's dynamic linker adds a handler to report SIGPIPE as an error,
+  // then doesn't want that behavior for toybox. So disable it for bionic.
+  if (CFG_TOYBOX_ON_ANDROID) signal(SIGPIPE, SIG_DFL);
+
   // If nommu can't fork, special reentry path.
   // Use !stacktop to signal "vfork happened", both before and after xexec()
   if (!CFG_TOYBOX_FORK) {