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
@@ -111,25 +111,24 @@ int eyefiService::UploadPhoto(
 #ifndef NDEBUG
     syslog(LOG_DEBUG,
             "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
             " filesignature=%s, encryption=%s, flags=%04X",
             macaddress.c_str(), fileid, filename.c_str(), filesize,
             filesignature.c_str(), encryption.c_str(), flags );
 #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",
                 (*i).id, (*i).type, (long)(*i).size );
 #endif
 
 #ifndef NDEBUG
         if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) {
             std::string idigest((*i).ptr,(*i).size);
diff --git a/src/eyetil.cc b/src/eyetil.cc
index d00c2ee..2fbd687 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -1,13 +1,14 @@
 #include <stdlib.h>
+#include <sys/stat.h>
 #include <syslog.h>
 #include <iostream>
 #include <cassert>
 #include <stdexcept>
 #include <openssl/md5.h>
 #include "eyetil.h"
 
 binary_t& binary_t::from_hex(const std::string& h) {
     /* TODO: algorithmize */
     std::string::size_type hs = h.length();
     if(hs&1)
         throw std::runtime_error("odd number of characters in hexadecimal number");
@@ -42,25 +43,40 @@ std::string binary_t::hex() const {
     return rv;
 }
 
 binary_t binary_t::md5() const {
     binary_t rv(MD5_DIGEST_LENGTH);
     if(!MD5(
                 (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())) {
         syslog(LOG_WARNING,"Failed to remove '%s' directory",dir.c_str());
     }
 }
 
 std::string tmpdir_t::get_file(const std::string& f) {
     std::string::size_type ls = f.rfind('/');