X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=scandir.cc;h=d0ed67d5167bc59e620d8442acc101afa64f11a5;hb=4a6945983fa171fa843c6f8955ba601f733f3ca5;hp=3e004fdfc29aee5af00282504fc94dcdc38f04aa;hpb=3cb5ea93e29ba5baf6a5d1f170bbc003d7e2fe35;p=cumulus.git

diff --git a/scandir.cc b/scandir.cc
index 3e004fd..d0ed67d 100644
--- a/scandir.cc
+++ b/scandir.cc
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "store.h"
+#include "sha1.h"
 
 using std::string;
 using std::vector;
@@ -29,7 +30,7 @@ int64_t encode_time(time_t time)
     return (int64_t)time * 1000000;
 }
 
-void dumpfile(int fd)
+void dumpfile(int fd, dictionary &file_info)
 {
     struct stat stat_buf;
     fstat(fd, &stat_buf);
@@ -42,6 +43,7 @@ void dumpfile(int fd)
         return;
     }
 
+    SHA1Checksum hash;
     while (true) {
         ssize_t res = read(fd, buf, sizeof(buf));
         if (res < 0) {
@@ -52,11 +54,13 @@ void dumpfile(int fd)
         } else if (res == 0) {
             break;
         } else {
+            hash.process(buf, res);
             size += res;
         }
     }
 
-    printf("    bytes=%Ld\n", size);
+    file_info["sha1"] = string((const char *)hash.checksum(),
+                               hash.checksum_size());
 }
 
 void scanfile(const string& path)
@@ -67,6 +71,9 @@ void scanfile(const string& path)
     char *buf;
     ssize_t len;
 
+    // Set to true if the item is a directory and we should recursively scan
+    bool recurse = false;
+
     dictionary file_info;
 
     lstat(path.c_str(), &stat_buf);
@@ -137,14 +144,14 @@ void scanfile(const string& path)
         flags = fcntl(fd, F_GETFL);
         fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
 
-        //dumpfile(fd);
         file_info["size"] = encode_u64(stat_buf.st_size);
+        dumpfile(fd, file_info);
         close(fd);
 
         break;
     case S_IFDIR:
         inode_type = 'd';
-        scandir(path);
+        recurse = true;
         break;
 
     default:
@@ -156,6 +163,11 @@ void scanfile(const string& path)
 
     info_dump->write_string(path);
     info_dump->write_dictionary(file_info);
+
+    // If we hit a directory, now that we've written the directory itself,
+    // recursively scan the directory.
+    if (recurse)
+        scandir(path);
 }
 
 void scandir(const string& path)
@@ -189,14 +201,12 @@ void scandir(const string& path)
 
 int main(int argc, char *argv[])
 {
-    FILE *dump = fopen("fileinfo", "w");
-    if (dump == NULL) {
-        fprintf(stderr, "Cannot open fileinfo: %m\n");
-        return 1;
-    }
+    SegmentStore ss(".");
+    SegmentWriter *sw = ss.new_segment();
+    info_dump = sw->new_object();
 
-    FileOutputStream os(dump);
-    info_dump = &os;
+    string uuid = SegmentWriter::format_uuid(sw->get_uuid());
+    printf("Backup UUID: %s\n", uuid.c_str());
 
     try {
         scanfile(".");
@@ -204,5 +214,7 @@ int main(int argc, char *argv[])
         fprintf(stderr, "IOException: %s\n", e.getError().c_str());
     }
 
+    delete sw;
+
     return 0;
 }