author | Oleg 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) |
commit | fdc2ed23c5c92cb38ab446b510056da01c7f3e12 (patch) (unidiff) | |
tree | 7609c1cdd0617547cf2c7bf0764ca0d0e33106d3 /src | |
parent | 4e64ab71bf43406f41d0a048f5a7a041b4cd798d (diff) | |
download | iii-fdc2ed23c5c92cb38ab446b510056da01c7f3e12.zip iii-fdc2ed23c5c92cb38ab446b510056da01c7f3e12.tar.gz iii-fdc2ed23c5c92cb38ab446b510056da01c7f3e12.tar.bz2 |
Fix indentation. Remove umask setting.
-rw-r--r-- | src/iiid.cc | 62 |
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 | |||
@@ -65,5 +65,5 @@ int main(int argc,char **argv) try { | |||
65 | } | 65 | } |
66 | break; | 66 | break; |
67 | case 'd': | 67 | case 'd': |
68 | daemon_mode = true; | 68 | daemon_mode = true; |
69 | break; | 69 | break; |
@@ -92,39 +92,37 @@ int main(int argc,char **argv) try { | |||
92 | globfree(&g); | 92 | globfree(&g); |
93 | 93 | ||
94 | if(daemon_mode){ | 94 | if(daemon_mode) { |
95 | pid_t pid, sid; | 95 | pid_t pid, sid; |
96 | 96 | ||
97 | /* Fork off the parent process */ | 97 | /* Fork off the parent process */ |
98 | pid = fork(); | 98 | pid = fork(); |
99 | if (pid < 0) { | 99 | if (pid < 0) { |
100 | exit(EXIT_FAILURE); | 100 | syslog(LOG_ERR, "Error forking the parent process"); |
101 | } | 101 | exit(EXIT_FAILURE); |
102 | /* If we got a good PID, then | 102 | } |
103 | we can exit the parent process. */ | ||
104 | if (pid > 0) { | ||
105 | exit(EXIT_SUCCESS); | ||
106 | } | ||
107 | 103 | ||
108 | /* Change the file mode mask */ | 104 | /* If we got a good PID, then we can exit the parent process. */ |
109 | umask(0); | 105 | if (pid > 0) { |
110 | 106 | exit(EXIT_SUCCESS); | |
111 | /* Create a new SID for the child process */ | 107 | } |
112 | sid = setsid(); | 108 | |
113 | if (sid < 0) { | 109 | /* Create a new SID for the child process */ |
114 | syslog(LOG_ERR, "Error creating a new SID for the child process"); | 110 | sid = setsid(); |
115 | exit(EXIT_FAILURE); | 111 | if (sid < 0) { |
116 | } | 112 | syslog(LOG_ERR, "Error creating a new SID for the child process"); |
117 | 113 | exit(EXIT_FAILURE); | |
118 | /* Change the current working directory */ | 114 | } |
119 | if ((chdir("/")) < 0) { | ||
120 | syslog(LOG_ERR, "Error changing current working directory to /"); | ||
121 | exit(EXIT_FAILURE); | ||
122 | } | ||
123 | 115 | ||
124 | /* Close out the standard file descriptors */ | 116 | /* Change the current working directory */ |
125 | close(STDIN_FILENO); | 117 | if ((chdir("/")) < 0) { |
126 | close(STDOUT_FILENO); | 118 | syslog(LOG_ERR, "Error changing current working directory to /"); |
127 | close(STDERR_FILENO); | 119 | exit(EXIT_FAILURE); |
128 | } | 120 | } |
121 | |||
122 | /* Close out the standard file descriptors */ | ||
123 | close(STDIN_FILENO); | ||
124 | close(STDOUT_FILENO); | ||
125 | close(STDERR_FILENO); | ||
126 | } | ||
129 | 127 | ||
130 | eyefiworker().run(port); | 128 | eyefiworker().run(port); |