ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove -d option from logwrapper

Browse source 
Removing the ability of logwrapper to die with a SIGSEGV at address
"return code from wait".

Change-Id: I563715db2b1e5e789af84190fc2ff78664d63572
This commit is contained in:
Rom Lemarchand 2013-01-03 14:37:57 -08:00
parent 2bf496378d
commit 4d74bcf445
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
logwrapper/logwrapper.c
View file

@ -35,17 +35,14 @@ void fatal(const char *msg) {
void usage() {
fatal(
"Usage: logwrapper [-d] BINARY [ARGS ...]\n"
"Usage: logwrapper 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"
"\n"
"-d: Causes logwrapper to SIGSEGV when BINARY terminates\n"
" fault address is set to the status of wait()\n");
"always LOG_INFO.\n");
}
void parent(const char *tag, int seg_fault_on_exit, int parent_read) {
void parent(const char *tag, int parent_read) {
int status;
char buffer[4096];
@ -105,8 +102,6 @@ void parent(const char *tag, int seg_fault_on_exit, 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[]) {
@ -124,7 +119,6 @@ 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;
@ -134,16 +128,6 @@ 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) {
@ -179,7 +163,7 @@ int main(int argc, char* argv[]) {
setgid(AID_LOG);
setuid(AID_LOG);
parent(argv[1], seg_fault_on_exit, parent_ptty);
parent(argv[1], parent_ptty);
}
return 0;