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 | |
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 | |||
@@ -3,139 +3,137 @@ | |||
3 | #include <sys/stat.h> | 3 | #include <sys/stat.h> |
4 | #include <glob.h> | 4 | #include <glob.h> |
5 | #include <iostream> | 5 | #include <iostream> |
6 | #include <cassert> | 6 | #include <cassert> |
7 | #include <stdexcept> | 7 | #include <stdexcept> |
8 | #include "eyetil.h" | 8 | #include "eyetil.h" |
9 | #include "eyefiworker.h" | 9 | #include "eyefiworker.h" |
10 | 10 | ||
11 | #include "config.h" | 11 | #include "config.h" |
12 | 12 | ||
13 | #include "eyefi.nsmap" | 13 | #include "eyefi.nsmap" |
14 | 14 | ||
15 | #define PHEADER \ | 15 | #define PHEADER \ |
16 | PACKAGE " Version " VERSION "\n" \ | 16 | PACKAGE " Version " VERSION "\n" \ |
17 | "Copyright (c) 2009 Klever Group" | 17 | "Copyright (c) 2009 Klever Group" |
18 | 18 | ||
19 | int main(int argc,char **argv) try { | 19 | int main(int argc,char **argv) try { |
20 | 20 | ||
21 | int port = 59278; | 21 | int port = 59278; |
22 | bool daemon_mode = false; | 22 | bool daemon_mode = false; |
23 | 23 | ||
24 | while(true) { | 24 | while(true) { |
25 | static struct option opts[] = { | 25 | static struct option opts[] = { |
26 | { "help", no_argument, 0, 'h' }, | 26 | { "help", no_argument, 0, 'h' }, |
27 | { "usage", no_argument, 0, 'h' }, | 27 | { "usage", no_argument, 0, 'h' }, |
28 | { "version", no_argument, 0, 'V' }, | 28 | { "version", no_argument, 0, 'V' }, |
29 | { "license", no_argument, 0, 'L' }, | 29 | { "license", no_argument, 0, 'L' }, |
30 | { "port", required_argument, 0, 'p' }, | 30 | { "port", required_argument, 0, 'p' }, |
31 | { "daemon", no_argument, 0, 'd' }, | 31 | { "daemon", no_argument, 0, 'd' }, |
32 | { NULL, 0, 0, 0 } | 32 | { NULL, 0, 0, 0 } |
33 | }; | 33 | }; |
34 | int c = getopt_long(argc,argv,"hVLp:d",opts,NULL); | 34 | int c = getopt_long(argc,argv,"hVLp:d",opts,NULL); |
35 | if(c==-1) break; | 35 | if(c==-1) break; |
36 | switch(c) { | 36 | switch(c) { |
37 | case 'h': | 37 | case 'h': |
38 | std::cerr << PHEADER << std::endl << std::endl | 38 | std::cerr << PHEADER << std::endl << std::endl |
39 | << " " << argv[0] << " [options]" << std::endl | 39 | << " " << argv[0] << " [options]" << std::endl |
40 | << std::endl << | 40 | << std::endl << |
41 | " -h, --help,\n" | 41 | " -h, --help,\n" |
42 | " --usage display this text\n" | 42 | " --usage display this text\n" |
43 | " -V, --version display version information\n" | 43 | " -V, --version display version information\n" |
44 | " -L, --license show license\n" | 44 | " -L, --license show license\n" |
45 | " -p <port>, --port=<port> port to listen to\n" | 45 | " -p <port>, --port=<port> port to listen to\n" |
46 | " (you're not likely to ever need it)\n" | 46 | " (you're not likely to ever need it)\n" |
47 | " -d, --daemon run as daemon\n" | 47 | " -d, --daemon run as daemon\n" |
48 | << std::endl << std::endl; | 48 | << std::endl << std::endl; |
49 | exit(0); | 49 | exit(0); |
50 | break; | 50 | break; |
51 | case 'V': | 51 | case 'V': |
52 | std::cerr << VERSION << std::endl; | 52 | std::cerr << VERSION << std::endl; |
53 | exit(0); | 53 | exit(0); |
54 | break; | 54 | break; |
55 | case 'L': | 55 | case 'L': |
56 | extern const char *COPYING; | 56 | extern const char *COPYING; |
57 | std::cerr << COPYING << std::endl; | 57 | std::cerr << COPYING << std::endl; |
58 | exit(0); | 58 | exit(0); |
59 | break; | 59 | break; |
60 | case 'p': | 60 | case 'p': |
61 | port = 0xffff&strtol(optarg,0,0); | 61 | port = 0xffff&strtol(optarg,0,0); |
62 | if(errno) { | 62 | if(errno) { |
63 | std::cerr << "Failed to parse port number" << std::endl; | 63 | std::cerr << "Failed to parse port number" << std::endl; |
64 | exit(1); | 64 | exit(1); |
65 | } | 65 | } |
66 | break; | 66 | break; |
67 | case 'd': | 67 | case 'd': |
68 | daemon_mode = true; | 68 | daemon_mode = true; |
69 | break; | 69 | break; |
70 | default: | 70 | default: |
71 | std::cerr << "Huh?" << std::endl; | 71 | std::cerr << "Huh?" << std::endl; |
72 | exit(1); | 72 | exit(1); |
73 | break; | 73 | break; |
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | const char *ident = rindex(*argv,'/'); | 77 | const char *ident = rindex(*argv,'/'); |
78 | if(ident) | 78 | if(ident) |
79 | ++ident; | 79 | ++ident; |
80 | else | 80 | else |
81 | ident = *argv; | 81 | ident = *argv; |
82 | openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON); | 82 | openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON); |
83 | syslog(LOG_INFO,"Starting iii eye-fi manager on port %d", port); | 83 | syslog(LOG_INFO,"Starting iii eye-fi manager on port %d", port); |
84 | 84 | ||
85 | struct stat st; | 85 | struct stat st; |
86 | if(stat(EYEKIN_CONF_DIR,&st) || !S_ISDIR(st.st_mode)) | 86 | if(stat(EYEKIN_CONF_DIR,&st) || !S_ISDIR(st.st_mode)) |
87 | syslog(LOG_WARNING,"configuration directory '%s' does not exist or is not a directory",EYEKIN_CONF_DIR); | 87 | syslog(LOG_WARNING,"configuration directory '%s' does not exist or is not a directory",EYEKIN_CONF_DIR); |
88 | glob_t g; int rg = glob(EYEKIN_CONF_DIR"/????????????.conf",GLOB_NOSORT,NULL,&g); | 88 | glob_t g; int rg = glob(EYEKIN_CONF_DIR"/????????????.conf",GLOB_NOSORT,NULL,&g); |
89 | if(rg || !g.gl_pathc) | 89 | if(rg || !g.gl_pathc) |
90 | syslog(LOG_WARNING,"I see nothing resembling a card config in '%s'",EYEKIN_CONF_DIR); | 90 | syslog(LOG_WARNING,"I see nothing resembling a card config in '%s'",EYEKIN_CONF_DIR); |
91 | else | 91 | else |
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); |
131 | 129 | ||
132 | closelog(); | 130 | closelog(); |
133 | return 0; | 131 | return 0; |
134 | } catch(const throwable_exit& e) { | 132 | } catch(const throwable_exit& e) { |
135 | return e.rc; | 133 | return e.rc; |
136 | } catch(const std::exception& e) { | 134 | } catch(const std::exception& e) { |
137 | syslog(LOG_CRIT,"Exiting iii daemon, because of error condition"); | 135 | syslog(LOG_CRIT,"Exiting iii daemon, because of error condition"); |
138 | syslog(LOG_CRIT,"Exception: %s",e.what()); | 136 | syslog(LOG_CRIT,"Exception: %s",e.what()); |
139 | return 1; | 137 | return 1; |
140 | } | 138 | } |
141 | 139 | ||