2 files changed, 32 insertions, 0 deletions

diff --git a/src/eyetil.cc b/src/eyetil.cc
index 6ccc4ae..fba8724 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -130,64 +130,74 @@ static void make_path_for_template(const std::string& p,mode_t m) {
 	}
     }
 }
 
 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('/');
     return dir+'/'+(
 	    (ls==std::string::npos)
 	    ? f
 	    : f.substr(ls+1)
 	);
 }
 
 tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) {
     if(!a) throw std::runtime_error("failed to archive_read_new()");
     if(archive_read_support_format_tar(a)) {
 	archive_read_finish(a);
 	throw std::runtime_error("failed to archive_read_support_format_tar()");
     }
     if(archive_read_open_memory(a,p,s)) {
 	archive_read_finish(a);
 	throw std::runtime_error("failed to archive_read_open_memory()");
     }
 }
 tarchive_t::~tarchive_t() {
     assert(a);
     archive_read_finish(a);
 }
 
 bool tarchive_t::read_next_header() {
     assert(a);
     return archive_read_next_header(a,&e)==ARCHIVE_OK;
 }
 
 std::string tarchive_t::entry_pathname() {
     assert(a); assert(e);
     return archive_entry_pathname(e);
 }
 
 bool tarchive_t::read_data_into_fd(int fd) {
     assert(a);
     return archive_read_data_into_fd(a,fd)==ARCHIVE_OK;
 }
 
 
 binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) {
     md5_digester rv;
     std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t),
 	    rv.updater<uint16_t>(), block512_t::tcpcksum );
     rv.update( binary_t(ukey) );
     return rv.final();
 }
+
+mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) {
+    f.open((fn=d.get_file("the-tarfile.tar")).c_str(),std::ios_base::in|std::ios_base::out|std::ios_base::trunc|std::ios_base::binary);
+}
+mimewrite_tarfile::~mimewrite_tarfile() {
+    unlink(fn.c_str());
+}
+int mimewrite_tarfile::write(const char *buf,size_t len) {
+    return f.write(buf,len) ? (idigest.update(buf,len),SOAP_OK) : SOAP_ERR;
+}
diff --git a/src/eyetil.h b/src/eyetil.h
index 8784cb4..64948d0 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -1,116 +1,138 @@
 #ifndef __EYETIL_H
 #define __EYETIL_H
 
 #include <vector>
 #include <string>
+#include <fstream>
 #include <archive.h>
 #include <archive_entry.h>
 #include "openssl/md5.h"
+#include "soapH.h"
 
 struct throwable_exit {
     int rc;
     throwable_exit(int rc_) : rc(rc_) { }
 };
 
 class binary_t : public std::vector<unsigned char> {
     public:
 	binary_t() { }
 	binary_t(size_type  n) : std::vector<unsigned char>(n) { }
 	binary_t(const std::string& h) { from_hex(h); }
 	binary_t(const void *d,size_t s) { from_data(d,s); }
 
 	binary_t& from_hex(const std::string& h);
 	binary_t& from_data(const void *d,size_t s);
 	binary_t& make_nonce();
 
 	std::string hex() const;
 	binary_t md5() const;
 };
 
 struct md5_digester {
     MD5_CTX ctx;
     md5_digester() { init(); }
 
     void init();
     void update(const void *d,size_t l);
     binary_t final();
 
     template<typename T>
     void update(const T& x) { update(&x,sizeof(x)); }
 
     template<typename T>
     struct update_iterator : public std::iterator<std::output_iterator_tag,T,void,T*,T&> {
 	md5_digester *d;
 	update_iterator(md5_digester *d_) : d(d_) { }
 	update_iterator(const update_iterator& x) : d(x.d) { }
 
 	update_iterator& operator*() { return *this; }
 	update_iterator& operator++() { return *this; }
 	update_iterator& operator++(int) { return *this; }
 
 	update_iterator& operator=(const T& x) {
 	    d->update(x); return *this;
 	}
     };
 
     template<typename T>
     update_iterator<T> updater() {
 	return update_iterator<T>(this);
     }
 
 };
 template<> inline void md5_digester::update<binary_t>(const binary_t& x) {
     update((const unsigned char*)&(x.front()),x.size());
 }
 
 #pragma pack(1)
 struct block512_t {
     enum { words = 512 / sizeof(uint16_t) };
     uint16_t data[words];
 
     inline uint8_t *dptr(size_t o) { return ((uint8_t*)this)+o; }
 
     static uint16_t tcpcksum(block512_t& data);
 };
 #pragma pack()
 
 struct integrity_digester {
     md5_digester md5;
     size_t data_size;
     block512_t data;
 
     integrity_digester() : data_size(0) { }
     void update(const void *d,size_t s);
     binary_t final(const std::string& ukey);
 };
 
 
 class tmpdir_t {
     public:
 	std::string dir;
 
 	tmpdir_t(const std::string& dt);
 	~tmpdir_t();
 
 	std::string get_file(const std::string& f);
 };
 
 class tarchive_t {
     public:
 	struct archive *a;
 	struct archive_entry *e;
 
 	tarchive_t(void *p,size_t s);
 	~tarchive_t();
 
 	bool read_next_header();
 
 	std::string entry_pathname();
 
 	bool read_data_into_fd(int fd);
 };
 
+struct mimewrite_base {
+    virtual ~mimewrite_base() { }
+
+    virtual int write(const char *buf,size_t len) = 0;
+    virtual void close() = 0;
+};
+struct mimewrite_string : public mimewrite_base {
+    std::string str;
+    int write(const char *buf,size_t len) { str.append(buf,len); return SOAP_OK; };
+    void close() { }
+};
+struct mimewrite_tarfile : public mimewrite_base {
+    std::string fn;
+    std::fstream f;
+    integrity_digester idigest;
+    mimewrite_tarfile(tmpdir_t& d);
+    ~mimewrite_tarfile();
+    int write(const char *buf,size_t len);
+    void close() { }
+};
 binary_t integrity_digest(const void *ptr,size_t size,
 	const std::string& ukey);
 
 #endif /* __EYETIL_H */