-rw-r--r-- | src/eyetil.cc | 9 | ||||
-rw-r--r-- | src/eyetil.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc index 5bceec7..5489d7b 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc | |||
@@ -174,30 +174,21 @@ bool tarchive_t::read_next_header() { | |||
174 | } | 174 | } |
175 | 175 | ||
176 | std::string tarchive_t::entry_pathname() { | 176 | std::string tarchive_t::entry_pathname() { |
177 | assert(a); assert(e); | 177 | assert(a); assert(e); |
178 | return archive_entry_pathname(e); | 178 | return archive_entry_pathname(e); |
179 | } | 179 | } |
180 | 180 | ||
181 | bool tarchive_t::read_data_into_fd(int fd) { | 181 | bool tarchive_t::read_data_into_fd(int fd) { |
182 | assert(a); | 182 | assert(a); |
183 | return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; | 183 | return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; |
184 | } | 184 | } |
185 | 185 | ||
186 | |||
187 | binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { | ||
188 | md5_digester rv; | ||
189 | std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), | ||
190 | rv.updater<uint16_t>(), block512_t::tcpcksum ); | ||
191 | rv.update( binary_t(ukey) ); | ||
192 | return rv.final(); | ||
193 | } | ||
194 | |||
195 | mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) { | 186 | mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) { |
196 | 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); | 187 | 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); |
197 | } | 188 | } |
198 | mimewrite_tarfile::~mimewrite_tarfile() { | 189 | mimewrite_tarfile::~mimewrite_tarfile() { |
199 | unlink(fn.c_str()); | 190 | unlink(fn.c_str()); |
200 | } | 191 | } |
201 | int mimewrite_tarfile::write(const char *buf,size_t len) { | 192 | int mimewrite_tarfile::write(const char *buf,size_t len) { |
202 | return f.write(buf,len) ? (idigest.update(buf,len),SOAP_OK) : SOAP_ERR; | 193 | return f.write(buf,len) ? (idigest.update(buf,len),SOAP_OK) : SOAP_ERR; |
203 | } | 194 | } |
diff --git a/src/eyetil.h b/src/eyetil.h index 8af18a4..22e07f1 100644 --- a/src/eyetil.h +++ b/src/eyetil.h | |||
@@ -123,16 +123,14 @@ struct mimewrite_string : public mimewrite_base { | |||
123 | int write(const char *buf,size_t len) { str.append(buf,len); return SOAP_OK; }; | 123 | int write(const char *buf,size_t len) { str.append(buf,len); return SOAP_OK; }; |
124 | void close() { } | 124 | void close() { } |
125 | }; | 125 | }; |
126 | struct mimewrite_tarfile : public mimewrite_base { | 126 | struct mimewrite_tarfile : public mimewrite_base { |
127 | std::string fn; | 127 | std::string fn; |
128 | std::fstream f; | 128 | std::fstream f; |
129 | integrity_digester idigest; | 129 | integrity_digester idigest; |
130 | mimewrite_tarfile(tmpdir_t& d); | 130 | mimewrite_tarfile(tmpdir_t& d); |
131 | ~mimewrite_tarfile(); | 131 | ~mimewrite_tarfile(); |
132 | int write(const char *buf,size_t len); | 132 | int write(const char *buf,size_t len); |
133 | void close() { } | 133 | void close() { } |
134 | }; | 134 | }; |
135 | binary_t integrity_digest(const void *ptr,size_t size, | ||
136 | const std::string& ukey); | ||
137 | 135 | ||
138 | #endif /* __EYETIL_H */ | 136 | #endif /* __EYETIL_H */ |