summaryrefslogtreecommitdiffabout
authorOleg Deribas <olegdmail-github@yahoo.com>2014-02-14 15:35:52 (UTC)
committer Oleg Deribas <olegdmail-github@yahoo.com>2014-02-14 15:35:52 (UTC)
commitfdc2ed23c5c92cb38ab446b510056da01c7f3e12 (patch) (side-by-side diff)
tree7609c1cdd0617547cf2c7bf0764ca0d0e33106d3
parent4e64ab71bf43406f41d0a048f5a7a041b4cd798d (diff)
downloadiii-fdc2ed23c5c92cb38ab446b510056da01c7f3e12.zip
iii-fdc2ed23c5c92cb38ab446b510056da01c7f3e12.tar.gz
iii-fdc2ed23c5c92cb38ab446b510056da01c7f3e12.tar.bz2
Fix indentation. Remove umask setting.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/iiid.cc62
1 files changed, 30 insertions, 32 deletions
diff --git a/src/iiid.cc b/src/iiid.cc
index bd65001..29acd06 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -61,13 +61,13 @@ int main(int argc,char **argv) try {
port = 0xffff&strtol(optarg,0,0);
if(errno) {
std::cerr << "Failed to parse port number" << std::endl;
exit(1);
}
break;
- case 'd':
+ case 'd':
daemon_mode = true;
break;
default:
std::cerr << "Huh?" << std::endl;
exit(1);
break;
@@ -88,47 +88,45 @@ int main(int argc,char **argv) try {
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;
+ if(daemon_mode) {
+ pid_t pid, sid;
- /* Fork off the parent process */
- pid = fork();
- if (pid < 0) {
- exit(EXIT_FAILURE);
- }
- /* If we got a good PID, then
- we can exit the parent process. */
- if (pid > 0) {
- exit(EXIT_SUCCESS);
- }
+ /* Fork off the parent process */
+ pid = fork();
+ if (pid < 0) {
+ syslog(LOG_ERR, "Error forking the parent process");
+ exit(EXIT_FAILURE);
+ }
- /* 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);
- }
+ /* If we got a good PID, then we can exit the parent process. */
+ if (pid > 0) {
+ exit(EXIT_SUCCESS);
+ }
+
+ /* 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);
+ }
- /* Close out the standard file descriptors */
- close(STDIN_FILENO);
- close(STDOUT_FILENO);
- close(STDERR_FILENO);
+ /* 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) {