summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRom Lemarchand <romlem@google.com>2013-01-10 09:42:12 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-01-10 09:42:12 -0800
commit7f213f878dea1825dba7db80967ea996364043e4 (patch)
tree8e276aa53a59b214f8455bc175e0247f66085573
parent571c1367682c83cb23481cc9c1028c8588a1fed0 (diff)
parentb10c7b4e3daadd0e8fccade8d8064f622b509eef (diff)
downloadsystem_core-7f213f878dea1825dba7db80967ea996364043e4.zip
system_core-7f213f878dea1825dba7db80967ea996364043e4.tar.gz
system_core-7f213f878dea1825dba7db80967ea996364043e4.tar.bz2
Merge "Revert "Remove -d option from logwrapper""
-rw-r--r--logwrapper/logwrapper.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/logwrapper/logwrapper.c b/logwrapper/logwrapper.c
index 3b876d4..dd777c0 100644
--- a/logwrapper/logwrapper.c
+++ b/logwrapper/logwrapper.c
@@ -35,14 +35,17 @@ void fatal(const char *msg) {
void usage() {
fatal(
- "Usage: logwrapper BINARY [ARGS ...]\n"
+ "Usage: logwrapper [-d] BINARY [ARGS ...]\n"
"\n"
"Forks and executes BINARY ARGS, redirecting stdout and stderr to\n"
"the Android logging system. Tag is set to BINARY, priority is\n"
- "always LOG_INFO.\n");
+ "always LOG_INFO.\n"
+ "\n"
+ "-d: Causes logwrapper to SIGSEGV when BINARY terminates\n"
+ " fault address is set to the status of wait()\n");
}
-void parent(const char *tag, int parent_read) {
+void parent(const char *tag, int seg_fault_on_exit, int parent_read) {
int status;
char buffer[4096];
@@ -102,6 +105,8 @@ void parent(const char *tag, int parent_read) {
} else
ALOG(LOG_INFO, "logwrapper", "%s wait() failed: %s (%d)", tag,
strerror(errno), errno);
+ if (seg_fault_on_exit)
+ *(int *)status = 0; // causes SIGSEGV with fault_address = status
}
void child(int argc, char* argv[]) {
@@ -119,6 +124,7 @@ void child(int argc, char* argv[]) {
int main(int argc, char* argv[]) {
pid_t pid;
+ int seg_fault_on_exit = 0;
int parent_ptty;
int child_ptty;
@@ -128,6 +134,16 @@ int main(int argc, char* argv[]) {
usage();
}
+ if (strncmp(argv[1], "-d", 2) == 0) {
+ seg_fault_on_exit = 1;
+ argc--;
+ argv++;
+ }
+
+ if (argc < 2) {
+ usage();
+ }
+
/* Use ptty instead of socketpair so that STDOUT is not buffered */
parent_ptty = open("/dev/ptmx", O_RDWR);
if (parent_ptty < 0) {
@@ -163,7 +179,7 @@ int main(int argc, char* argv[]) {
setgid(AID_LOG);
setuid(AID_LOG);
- parent(argv[1], parent_ptty);
+ parent(argv[1], seg_fault_on_exit, parent_ptty);
}
return 0;