Compute SHA-1 checksums of regular files to be stored with index data.

[cumulus.git] / scandir.cc

diff --git a/scandir.cc b/scandir.cc
index d0f76d1..81ddd4b 100644 (file)
--- 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)
@@ -71,11 +75,7 @@ void scanfile(const string& path)
 
     lstat(path.c_str(), &stat_buf);
 
-    printf("%s:\n", path.c_str());
-    printf("  ino=%Ld, perm=%04o, uid=%d, gid=%d, nlink=%d, blksize=%d, size=%Ld\n",
-           (int64_t)stat_buf.st_ino, stat_buf.st_mode & 07777,
-           stat_buf.st_uid, stat_buf.st_gid, stat_buf.st_nlink,
-           (int)stat_buf.st_blksize, (int64_t)stat_buf.st_size);
+    printf("%s\n", path.c_str());
 
     file_info["mode"] = encode_u16(stat_buf.st_mode & 07777);
     file_info["atime"] = encode_u64(encode_time(stat_buf.st_atime));
@@ -88,23 +88,18 @@ void scanfile(const string& path)
 
     switch (stat_buf.st_mode & S_IFMT) {
     case S_IFIFO:
-        printf("    FIFO\n");
         inode_type = 'p';
         break;
     case S_IFSOCK:
-        printf("    socket\n");
         inode_type = 's';
         break;
     case S_IFCHR:
-        printf("    character device\n");
         inode_type = 'c';
         break;
     case S_IFBLK:
-        printf("    block device\n");
         inode_type = 'b';
         break;
     case S_IFLNK:
-        printf("    symlink\n");
         inode_type = 'l';
 
         /* Use the reported file size to allocate a buffer large enough to read
@@ -126,7 +121,6 @@ void scanfile(const string& path)
         delete[] buf;
         break;
     case S_IFREG:
-        printf("    regular file\n");
         inode_type = '-';
 
         /* Be paranoid when opening the file.  We have no guarantee that the
@@ -147,13 +141,12 @@ 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:
-        printf("    directory\n");
         inode_type = 'd';
         scandir(path);
         break;
@@ -210,7 +203,7 @@ int main(int argc, char *argv[])
     info_dump = &os;
 
     try {
-        scandir(".");
+        scanfile(".");
     } catch (IOException e) {
         fprintf(stderr, "IOException: %s\n", e.getError().c_str());
     }