X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=store.cc;h=aa69d9e8a4a7e3f4af329138027d0a78ce180623;hb=974240b635af9cf2b94e2f1f3c02beab662a189d;hp=720d3bb7da8a6abd4e7e42be35c0bb7c733660e5;hpb=0dfc70e01ddb7d2bce0db03d5364c0bd3a2bb308;p=cumulus.git

diff --git a/store.cc b/store.cc
index 720d3bb..aa69d9e 100644
--- a/store.cc
+++ b/store.cc
@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/resource.h>
@@ -42,6 +43,7 @@
 
 #include "store.h"
 #include "ref.h"
+#include "util.h"
 
 using std::max;
 using std::list;
@@ -54,16 +56,6 @@ using std::string;
 const char *filter_program = "bzip2 -c";
 const char *filter_extension = ".bz2";
 
-static void cloexec(int fd)
-{
-    long flags = fcntl(fd, F_GETFD);
-
-    if (flags < 0)
-        return;
-
-    fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
-}
-
 Tarfile::Tarfile(RemoteFile *file, const string &segment)
     : size(0),
       segment_name(segment)
@@ -85,14 +77,14 @@ Tarfile::~Tarfile()
     tar_write(buf, TAR_BLOCK_SIZE);
 
     if (close(filter_fd) != 0)
-        throw IOException("Error closing Tarfile");
+        fatal("Error closing Tarfile");
 
     /* ...and wait for filter process to finish. */
     int status;
     waitpid(filter_pid, &status, 0);
 
     if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-        throw IOException("Filter process error");
+        fatal("Filter process error");
     }
 
     close(real_fd);
@@ -109,13 +101,13 @@ int spawn_filter(int fd_out, const char *program, pid_t *filter_pid)
 
     /* Create a pipe for communicating with the filter process. */
     if (pipe(fds) < 0) {
-        throw IOException("Unable to create pipe for filter");
+        fatal("Unable to create pipe for filter");
     }
 
     /* Create a child process which can exec() the filter program. */
     pid = fork();
     if (pid < 0)
-        throw IOException("Unable to fork filter process");
+        fatal("Unable to fork filter process");
 
     if (pid > 0) {
         /* Parent process */
@@ -158,7 +150,7 @@ void Tarfile::tar_write(const char *data, size_t len)
             if (errno == EINTR)
                 continue;
             fprintf(stderr, "Write error: %m\n");
-            throw IOException("Write error");
+            fatal("Write error");
         }
 
         len -= res;