summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -119,9 +119,8 @@ int eyefiService::UploadPhoto(
119 119
120 umask(eyekinfig.get_umask()); 120 umask(eyekinfig.get_umask());
121 121
122 std::string td = eyekinfig.get_targetdir(); 122 std::string td = eyekinfig.get_targetdir();
123 /* TODO: try to create, if needed */
124 tmpdir_t indir(td+"/.incoming.XXXXXX"); 123 tmpdir_t indir(td+"/.incoming.XXXXXX");
125 124
126 for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { 125 for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) {
127#ifndef NDEBUG 126#ifndef NDEBUG
diff --git a/src/eyetil.cc b/src/eyetil.cc
index d00c2ee..2fbd687 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -1,5 +1,6 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <sys/stat.h>
2#include <syslog.h> 3#include <syslog.h>
3#include <iostream> 4#include <iostream>
4#include <cassert> 5#include <cassert>
5#include <stdexcept> 6#include <stdexcept>
@@ -50,9 +51,24 @@ binary_t binary_t::md5() const {
50 throw std::runtime_error("failed to md5()"); 51 throw std::runtime_error("failed to md5()");
51 return rv; 52 return rv;
52} 53}
53 54
55static void make_path_for_template(const std::string& p,mode_t m) {
56 struct stat st;
57 std::string pp;
58 for(std::string::size_type sl=p.find('/',1);
59 sl!=std::string::npos;
60 sl=p.find('/',sl+1)) {
61 if(stat( (pp=p.substr(0,sl)).c_str() ,&st)
62 || !S_ISDIR(st.st_mode)) {
63 if(mkdir(pp.c_str(),m))
64 throw std::runtime_error("failed to mkdir()");
65 }
66 }
67}
68
54tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) { 69tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) {
70 make_path_for_template(dt,0777);
55 if(!mkdtemp((char*)dir.data())) 71 if(!mkdtemp((char*)dir.data()))
56 throw std::runtime_error("failed to mkdtmp()"); 72 throw std::runtime_error("failed to mkdtmp()");
57} 73}
58tmpdir_t::~tmpdir_t() { 74tmpdir_t::~tmpdir_t() {