if (real_fd < 0)
throw IOException("Error opening output file");
- filter_fd = spawn_filter(real_fd);
+ filter_fd = spawn_filter(real_fd, filter_program, &filter_pid);
}
Tarfile::~Tarfile()
* on the TAR output. The file descriptor to which output should be written
* must be specified; the return value is the file descriptor which will be
* attached to the standard input of the filter program. */
-int Tarfile::spawn_filter(int fd_out)
+int spawn_filter(int fd_out, const char *program, pid_t *filter_pid)
{
int fds[2];
+ pid_t pid;
/* Create a pipe for communicating with the filter process. */
if (pipe(fds) < 0) {
}
/* Create a child process which can exec() the filter program. */
- filter_pid = fork();
- if (filter_pid < 0)
+ pid = fork();
+ if (pid < 0)
throw IOException("Unable to fork filter process");
- if (filter_pid > 0) {
+ if (pid > 0) {
/* Parent process */
close(fds[0]);
cloexec(fds[1]);
+ if (filter_pid != NULL)
+ *filter_pid = pid;
} else {
/* Child process. Rearrange file descriptors. stdin is fds[0], stdout
* is fd_out, stderr is unchanged. */
close(fd_out);
/* Exec the filter program. */
- execlp("/bin/sh", "/bin/sh", "-c", filter_program, NULL);
+ execlp("/bin/sh", "/bin/sh", "-c", program, NULL);
/* Should not reach here except for error cases. */
fprintf(stderr, "Could not exec filter: %m\n");
void Tarfile::write_object(int id, const char *data, size_t len)
{
+ struct tar_header header;
+ memset(&header, 0, sizeof(header));
+
char buf[64];
sprintf(buf, "%08x", id);
string path = segment_name + "/" + buf;
- internal_write_object(path, data, len);
-}
-
-void Tarfile::internal_write_object(const string &path,
- const char *data, size_t len)
-{
- struct tar_header header;
- memset(&header, 0, sizeof(header));
-
assert(path.size() < 100);
memcpy(header.name, path.data(), path.size());
sprintf(header.mode, "%07o", 0600);
segment = new segment_info;
segment->name = generate_uuid();
-
- string filename = path + "/" + segment->name + ".tar";
- filename += filter_extension;
- segment->file = new Tarfile(filename, segment->name);
-
+ segment->basename = segment->name + ".tar";
+ segment->basename += filter_extension;
+ segment->fullname = path + "/" + segment->basename;
+ segment->file = new Tarfile(segment->fullname, segment->name);
segment->count = 0;
segments[group] = segment;
struct segment_info *segment = segments[group];
delete segment->file;
+
+ if (db != NULL) {
+ SHA1Checksum segment_checksum;
+ if (segment_checksum.process_file(segment->fullname.c_str())) {
+ string checksum = segment_checksum.checksum_str();
+ db->SetSegmentChecksum(segment->name, segment->basename, checksum);
+ }
+ }
+
segments.erase(segments.find(group));
delete segment;
}