summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc1
-rw-r--r--src/eyetil.cc16
2 files changed, 16 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 30c06fa..97cb33b 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -117,13 +117,12 @@ int eyefiService::UploadPhoto(
#endif
eyekinfig_t eyekinfig(macaddress);
umask(eyekinfig.get_umask());
std::string td = eyekinfig.get_targetdir();
- /* TODO: try to create, if needed */
tmpdir_t indir(td+"/.incoming.XXXXXX");
for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) {
#ifndef NDEBUG
syslog(LOG_DEBUG,
" MIME attachment with id=%s, type=%s, size=%ld",
diff --git a/src/eyetil.cc b/src/eyetil.cc
index d00c2ee..2fbd687 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -1,7 +1,8 @@
#include <stdlib.h>
+#include <sys/stat.h>
#include <syslog.h>
#include <iostream>
#include <cassert>
#include <stdexcept>
#include <openssl/md5.h>
#include "eyetil.h"
@@ -48,13 +49,28 @@ binary_t binary_t::md5() const {
(const unsigned char*)&(front()),size(),
(unsigned char*)&(rv.front()) ))
throw std::runtime_error("failed to md5()");
return rv;
}
+static void make_path_for_template(const std::string& p,mode_t m) {
+ struct stat st;
+ std::string pp;
+ for(std::string::size_type sl=p.find('/',1);
+ sl!=std::string::npos;
+ sl=p.find('/',sl+1)) {
+ if(stat( (pp=p.substr(0,sl)).c_str() ,&st)
+ || !S_ISDIR(st.st_mode)) {
+ if(mkdir(pp.c_str(),m))
+ throw std::runtime_error("failed to mkdir()");
+ }
+ }
+}
+
tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) {
+ make_path_for_template(dt,0777);
if(!mkdtemp((char*)dir.data()))
throw std::runtime_error("failed to mkdtmp()");
}
tmpdir_t::~tmpdir_t() {
assert(!dir.empty());
if(rmdir(dir.c_str())) {