-rw-r--r-- | src/eyekinfig.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eyekinfig.cc b/src/eyekinfig.cc index 27a5a56..56c74a7 100644 --- a/src/eyekinfig.cc +++ b/src/eyekinfig.cc | |||
@@ -1,67 +1,67 @@ | |||
1 | #include <cassert> | 1 | #include <cassert> |
2 | #include <stdexcept> | 2 | #include <stdexcept> |
3 | #include <autosprintf.h> | 3 | #include <autosprintf.h> |
4 | #include "eyekinfig.h" | 4 | #include "eyekinfig.h" |
5 | 5 | ||
6 | #include "config.h" | 6 | #include "config.h" |
7 | 7 | ||
8 | eyekinfig_t::eyekinfig_t(const std::string& ma) | 8 | eyekinfig_t::eyekinfig_t(const std::string& ma) |
9 | : macaddress(ma) { | 9 | : macaddress(ma) { |
10 | static cfg_opt_t opts[] = { | 10 | static cfg_opt_t opts[] = { |
11 | CFG_STR((char*)"targetdir",(char*)"/var/lib/" PACKAGE "/%s",CFGF_NONE), | 11 | CFG_STR((char*)"targetdir",(char*)"/var/lib/" PACKAGE "/%s",CFGF_NONE), |
12 | CFG_STR((char*)"uploadkey",(char*)"",CFGF_NONE), | 12 | CFG_STR((char*)"uploadkey",(char*)"",CFGF_NONE), |
13 | CFG_STR((char*)"on-start-session",(char*)"",CFGF_NONE), | 13 | CFG_STR((char*)"on-start-session",(char*)"",CFGF_NONE), |
14 | CFG_STR((char*)"on-upload-photo",(char*)"",CFGF_NONE), | 14 | CFG_STR((char*)"on-upload-photo",(char*)"",CFGF_NONE), |
15 | CFG_STR((char*)"on-mark-last-photo-in-roll",(char*)"",CFGF_NONE), | 15 | CFG_STR((char*)"on-mark-last-photo-in-roll",(char*)"",CFGF_NONE), |
16 | CFG_INT((char*)"umask",022,CFGF_NONE), | 16 | CFG_INT((char*)"umask",022,CFGF_NONE), |
17 | CFG_END() | 17 | CFG_END() |
18 | }; | 18 | }; |
19 | cfg = cfg_init(opts,CFGF_NONE); | 19 | cfg = cfg_init(opts,CFGF_NONE); |
20 | if(!cfg) | 20 | if(!cfg) |
21 | throw std::runtime_error("failed to cfg_init()"); | 21 | throw std::runtime_error("failed to cfg_init()"); |
22 | std::string::size_type ls = macaddress.rfind('/'); | 22 | std::string::size_type ls = macaddress.rfind('/'); |
23 | if(cfg_parse(cfg,gnu::autosprintf( | 23 | if(cfg_parse(cfg,gnu::autosprintf( |
24 | EYEKIN_CONF_DIR "/%s.conf", | 24 | EYEKIN_CONF_DIR "/%s.conf", |
25 | (ls==std::string::npos) | 25 | (ls==std::string::npos) |
26 | ? macaddress.c_str() | 26 | ? macaddress.c_str() |
27 | : macaddress.substr(ls+1).c_str() | 27 | : macaddress.substr(ls+1).c_str() |
28 | )) ==CFG_PARSE_ERROR) { | 28 | )) ==CFG_PARSE_ERROR) { |
29 | if(cfg) cfg_free(cfg); | 29 | if(cfg) cfg_free(cfg); |
30 | cfg=0; | 30 | cfg=0; |
31 | throw std::runtime_error("failed to cfg_parse()"); | 31 | throw std::runtime_error("failed to cfg_parse()"); |
32 | } | 32 | } |
33 | } | 33 | } |
34 | 34 | ||
35 | eyekinfig_t::~eyekinfig_t() { | 35 | eyekinfig_t::~eyekinfig_t() { |
36 | if(cfg) cfg_free(cfg); | 36 | if(cfg) cfg_free(cfg); |
37 | } | 37 | } |
38 | 38 | ||
39 | std::string eyekinfig_t::get_targetdir() { | 39 | std::string eyekinfig_t::get_targetdir() { |
40 | assert(cfg); | 40 | assert(cfg); |
41 | return gnu::autosprintf(cfg_getstr(cfg,"targetdir"),macaddress.c_str()); | 41 | return gnu::autosprintf(cfg_getstr(cfg,"targetdir"),macaddress.c_str()); |
42 | } | 42 | } |
43 | 43 | ||
44 | std::string eyekinfig_t::get_upload_key() { | 44 | std::string eyekinfig_t::get_upload_key() { |
45 | assert(cfg); | 45 | assert(cfg); |
46 | return cfg_getstr(cfg,"uploadkey"); | 46 | return cfg_getstr(cfg,"uploadkey"); |
47 | } | 47 | } |
48 | 48 | ||
49 | std::string eyekinfig_t::get_on_start_session() { | 49 | std::string eyekinfig_t::get_on_start_session() { |
50 | assert(cfg); | 50 | assert(cfg); |
51 | return cfg_getstr(cfg,"on-start-session"); | 51 | return cfg_getstr(cfg,"on-start-session"); |
52 | } | 52 | } |
53 | std::string eyekinfig_t::get_on_upload_photo() { | 53 | std::string eyekinfig_t::get_on_upload_photo() { |
54 | assert(cfg); | 54 | assert(cfg); |
55 | return cfg_getstr(cfg,"on-upload-photo"); | 55 | return cfg_getstr(cfg,"on-upload-photo"); |
56 | } | 56 | } |
57 | 57 | ||
58 | std::string eyekinfig_t::get_on_mark_last_photo_in_roll() { | 58 | std::string eyekinfig_t::get_on_mark_last_photo_in_roll() { |
59 | assert(cfg); | 59 | assert(cfg); |
60 | return cfg_getstr(cfg,"on-mark-last-photo-in-roll"); | 60 | return cfg_getstr(cfg,"on-mark-last-photo-in-roll"); |
61 | } | 61 | } |
62 | 62 | ||
63 | 63 | ||
64 | int eyekinfig_t::get_umask() { | 64 | int eyekinfig_t::get_umask() { |
65 | assert(cfg); | 65 | assert(cfg); |
66 | return cfg_getint(cfg,"umask"); | 66 | return 0777&cfg_getint(cfg,"umask"); |
67 | } | 67 | } |