summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/iiid.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/iiid.cc b/src/iiid.cc
index bd65001..29acd06 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -52,90 +52,88 @@ int main(int argc,char **argv) try {
std::cerr << VERSION << std::endl;
exit(0);
break;
case 'L':
extern const char *COPYING;
std::cerr << COPYING << std::endl;
exit(0);
break;
case 'p':
port = 0xffff&strtol(optarg,0,0);
if(errno) {
std::cerr << "Failed to parse port number" << std::endl;
exit(1);
}
break;
case 'd':
daemon_mode = true;
break;
default:
std::cerr << "Huh?" << std::endl;
exit(1);
break;
}
}
const char *ident = rindex(*argv,'/');
if(ident)
++ident;
else
ident = *argv;
openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON);
syslog(LOG_INFO,"Starting iii eye-fi manager on port %d", port);
struct stat st;
if(stat(EYEKIN_CONF_DIR,&st) || !S_ISDIR(st.st_mode))
syslog(LOG_WARNING,"configuration directory '%s' does not exist or is not a directory",EYEKIN_CONF_DIR);
glob_t g; int rg = glob(EYEKIN_CONF_DIR"/????????????.conf",GLOB_NOSORT,NULL,&g);
if(rg || !g.gl_pathc)
syslog(LOG_WARNING,"I see nothing resembling a card config in '%s'",EYEKIN_CONF_DIR);
else
globfree(&g);
if(daemon_mode) {
pid_t pid, sid;
/* Fork off the parent process */
pid = fork();
if (pid < 0) {
+ syslog(LOG_ERR, "Error forking the parent process");
exit(EXIT_FAILURE);
}
- /* If we got a good PID, then
- we can exit the parent process. */
+
+ /* If we got a good PID, then we can exit the parent process. */
if (pid > 0) {
exit(EXIT_SUCCESS);
}
- /* Change the file mode mask */
- umask(0);
-
/* Create a new SID for the child process */
sid = setsid();
if (sid < 0) {
syslog(LOG_ERR, "Error creating a new SID for the child process");
exit(EXIT_FAILURE);
}
/* Change the current working directory */
if ((chdir("/")) < 0) {
syslog(LOG_ERR, "Error changing current working directory to /");
exit(EXIT_FAILURE);
}
/* Close out the standard file descriptors */
close(STDIN_FILENO);
close(STDOUT_FILENO);
close(STDERR_FILENO);
}
eyefiworker().run(port);
closelog();
return 0;
} catch(const throwable_exit& e) {
return e.rc;
} catch(const std::exception& e) {
syslog(LOG_CRIT,"Exiting iii daemon, because of error condition");
syslog(LOG_CRIT,"Exception: %s",e.what());
return 1;
}