author | Michael Krelin <hacker@klever.net> | 2012-01-20 20:44:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2012-01-20 20:44:42 (UTC) |
commit | ad7811fbcf54d0aebcd35c20d4a211d11029d1a2 (patch) (unidiff) | |
tree | ca94dd45ab61e4569e16a8a8830f94f5365ad5f4 /src | |
parent | f1f12e73c9a62f29decab82c56793e4e72eea911 (diff) | |
download | iii-ad7811fbcf54d0aebcd35c20d4a211d11029d1a2.zip iii-ad7811fbcf54d0aebcd35c20d4a211d11029d1a2.tar.gz iii-ad7811fbcf54d0aebcd35c20d4a211d11029d1a2.tar.bz2 |
fixed misplaced parenthesis
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiservice.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 5c4e308..9ef4bb6 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -157,72 +157,72 @@ int eyefiService::UploadPhoto( | |||
157 | #endif | 157 | #endif |
158 | 158 | ||
159 | if(!tf.empty()) throw std::runtime_error("already seen tarball"); | 159 | if(!tf.empty()) throw std::runtime_error("already seen tarball"); |
160 | if(!digest.empty()) throw std::runtime_error("already have integrity digest"); | 160 | if(!digest.empty()) throw std::runtime_error("already have integrity digest"); |
161 | digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); | 161 | digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); |
162 | #ifndef NDEBUG | 162 | #ifndef NDEBUG |
163 | syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); | 163 | syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); |
164 | #endif | 164 | #endif |
165 | 165 | ||
166 | tarchive_t a((*i).ptr,(*i).size); | 166 | tarchive_t a((*i).ptr,(*i).size); |
167 | while(a.read_next_header()) { | 167 | while(a.read_next_header()) { |
168 | std::string f = indir.get_file(a.entry_pathname()); | 168 | std::string f = indir.get_file(a.entry_pathname()); |
169 | std::string::size_type fl = f.length(); | 169 | std::string::size_type fl = f.length(); |
170 | if(fl<4) continue; | 170 | if(fl<4) continue; |
171 | const char *s = f.c_str()+fl-4; | 171 | const char *s = f.c_str()+fl-4; |
172 | static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW", | 172 | static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW", |
173 | ".RW2",".CR2" }; | 173 | ".RW2",".CR2" }; |
174 | if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes), | 174 | if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes), |
175 | std::not1(std::bind1st(std::ptr_fun(strcasecmp),s))) | 175 | std::not1(std::bind1st(std::ptr_fun(strcasecmp),s))) |
176 | != suffixes+sizeof(suffixes)/sizeof(*suffixes)) | 176 | != suffixes+sizeof(suffixes)/sizeof(*suffixes)) |
177 | tf = f; | 177 | tf = f; |
178 | else if(!strcasecmp(s,".log")) | 178 | else if(!strcasecmp(s,".log")) |
179 | lf = f; | 179 | lf = f; |
180 | else continue; | 180 | else continue; |
181 | int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); | 181 | int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); |
182 | if(fd<0) | 182 | if(fd<0) |
183 | throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); | 183 | throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); |
184 | if(!a.read_data_into_fd(fd)) | 184 | if(!a.read_data_into_fd(fd)) |
185 | throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); | 185 | throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); |
186 | close(fd); | 186 | close(fd); |
187 | } | 187 | } |
188 | } | 188 | } |
189 | } | 189 | } |
190 | 190 | ||
191 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); | 191 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); |
192 | if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); | 192 | if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); |
193 | 193 | ||
194 | std::string::size_type ls = tf.rfind('/'); | 194 | std::string::size_type ls = tf.rfind('/'); |
195 | // XXX: actually, lack of '/' signifies error here | 195 | // XXX: actually, lack of '/' signifies error here |
196 | std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); | 196 | std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); |
197 | ls = lf.rfind('/'); | 197 | ls = lf.rfind('/'); |
198 | std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1); | 198 | std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1); |
199 | std::string ttf,tlf; | 199 | std::string ttf,tlf; |
200 | bool success = false; | 200 | bool success = false; |
201 | for(int i=0;i<32767;++i) { | 201 | for(int i=0;i<32767;++i) { |
202 | const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s"; | 202 | const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s"; |
203 | ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i); | 203 | ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i); |
204 | if(!lf.empty()) tlf = (const char*)gnu::autosprintf(fmt,td.c_str(),lbn.c_str(),i); | 204 | if(!lf.empty()) tlf = (const char*)gnu::autosprintf(fmt,td.c_str(),lbn.c_str(),i); |
205 | if( (!link(tf.c_str(),ttf.c_str())) && (lf.empty()) || !link(lf.c_str(),tlf.c_str()) ) { | 205 | if( (!link(tf.c_str(),ttf.c_str())) && (lf.empty() || !link(lf.c_str(),tlf.c_str())) ) { |
206 | unlink(tf.c_str()); | 206 | unlink(tf.c_str()); |
207 | if(!lf.empty()) unlink(lf.c_str()); | 207 | if(!lf.empty()) unlink(lf.c_str()); |
208 | success=true; | 208 | success=true; |
209 | break; | 209 | break; |
210 | } | 210 | } |
211 | } | 211 | } |
212 | std::string cmd = eyekinfig.get_on_upload_photo(); | 212 | std::string cmd = eyekinfig.get_on_upload_photo(); |
213 | if(success && !cmd.empty()) { | 213 | if(success && !cmd.empty()) { |
214 | if(detached_child()) { | 214 | if(detached_child()) { |
215 | putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) ); | 215 | putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) ); |
216 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); | 216 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); |
217 | putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) ); | 217 | putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) ); |
218 | if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) ); | 218 | if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) ); |
219 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; | 219 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; |
220 | execv("/bin/sh",argv); | 220 | execv("/bin/sh",argv); |
221 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 221 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
222 | _exit(-1); | 222 | _exit(-1); |
223 | } | 223 | } |
224 | } | 224 | } |
225 | 225 | ||
226 | r.success = true; | 226 | r.success = true; |
227 | return SOAP_OK; | 227 | return SOAP_OK; |
228 | } | 228 | } |