X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=scandir.cc;h=82160a162c04b750786988f0b2ee6a585aa80d51;hb=a4cf5f4d8df46fa00992a210d587cd824cedcb08;hp=d35c5520f66c8f52aca5d9cd7f658bf73c87c13d;hpb=3816062e0e1322be7e6e9f4824ecddc26b29fafd;p=cumulus.git

diff --git a/scandir.cc b/scandir.cc
index d35c552..82160a1 100644
--- a/scandir.cc
+++ b/scandir.cc
@@ -351,7 +351,6 @@ void dump_inode(const string& path,         // Path within snapshot
 
         file_size = dumpfile(fd, file_info, path, stat_buf);
         file_info["size"] = encode_int(file_size);
-        close(fd);
 
         if (file_size < 0)
             return;             // error occurred; do not dump file
@@ -676,7 +675,6 @@ int main(int argc, char *argv[])
             printf("    %s\n", i->c_str());
     }
 
-    tss = new TarSegmentStore(backup_dest);
     block_buf = new char[LBS_BLOCK_SIZE];
 
     /* Store the time when the backup started, so it can be included in the
@@ -696,6 +694,8 @@ int main(int argc, char *argv[])
     db->Open(database_path.c_str(), desc_buf,
              backup_scheme.size() ? backup_scheme.c_str() : NULL);
 
+    tss = new TarSegmentStore(backup_dest, db);
+
     /* Initialize the stat cache, for skipping over unchanged files. */
     statcache = new StatCache;
     statcache->Open(localdb_dir.c_str(), desc_buf,
@@ -716,8 +716,6 @@ int main(int argc, char *argv[])
     string backup_root = root->get_ref().to_string();
     delete root;
 
-    db->Close();
-
     statcache->Close();
     delete statcache;
 
@@ -725,6 +723,8 @@ int main(int argc, char *argv[])
     tss->dump_stats();
     delete tss;
 
+    db->Close();
+
     /* Write a backup descriptor file, which says which segments are needed and
      * where to start to restore this snapshot.  The filename is based on the
      * current time. */