summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc29
1 files changed, 10 insertions, 19 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 0bf26c4..4ca2777 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -11,33 +11,24 @@
#include "soapeyefiService.h"
static binary_t session_nonce;
static bool detached_child() {
pid_t p = fork();
- if(p<0) throw std::runtime_error("failed to fork()");
+ if(p<0) {
+ syslog(LOG_ERR,"Failed to fork away for hook execution");
+ _exit(-1);
+ }
if(!p) {
- p = fork();
- if(p<0) {
- syslog(LOG_ERR,"Failed to re-fork child process");
- _exit(-1);
- }
- if(!p) {
- setsid();
- for(int i=getdtablesize();i>=0;--i) close(i);
- int i=open("/dev/null",O_RDWR); assert(i==0);
- i = dup(i); assert(i==1);
- i = dup(i); assert(i==2);
- return true;
- }
- _exit(0);
+ setsid();
+ for(int i=getdtablesize();i>=0;--i) close(i);
+ int i=open("/dev/null",O_RDWR); assert(i==0);
+ i = dup(i); assert(i==1);
+ i = dup(i); assert(i==2);
+ return true;
}
- int rc;
- if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()");
- if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process");
- if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error");
return false;
}
int eyefiService::StartSession(
std::string macaddress,std::string cnonce,
int transfermode,long transfermodetimestamp,