projects
/
cumulus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3e004fd
..
81ddd4b
100644
(file)
--- a/
scandir.cc
+++ b/
scandir.cc
@@
-15,6
+15,7
@@
#include <vector>
#include "store.h"
#include <vector>
#include "store.h"
+#include "sha1.h"
using std::string;
using std::vector;
using std::string;
using std::vector;
@@
-29,7
+30,7
@@
int64_t encode_time(time_t time)
return (int64_t)time * 1000000;
}
return (int64_t)time * 1000000;
}
-void dumpfile(int fd)
+void dumpfile(int fd
, dictionary &file_info
)
{
struct stat stat_buf;
fstat(fd, &stat_buf);
{
struct stat stat_buf;
fstat(fd, &stat_buf);
@@
-42,6
+43,7
@@
void dumpfile(int fd)
return;
}
return;
}
+ SHA1Checksum hash;
while (true) {
ssize_t res = read(fd, buf, sizeof(buf));
if (res < 0) {
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 {
} else if (res == 0) {
break;
} else {
+ hash.process(buf, res);
size += res;
}
}
size += res;
}
}
- printf(" bytes=%Ld\n", size);
+ file_info["sha1"] = string((const char *)hash.checksum(),
+ hash.checksum_size());
}
void scanfile(const string& path)
}
void scanfile(const string& path)
@@
-137,8
+141,8
@@
void scanfile(const string& path)
flags = fcntl(fd, F_GETFL);
fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
flags = fcntl(fd, F_GETFL);
fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
- //dumpfile(fd);
file_info["size"] = encode_u64(stat_buf.st_size);
file_info["size"] = encode_u64(stat_buf.st_size);
+ dumpfile(fd, file_info);
close(fd);
break;
close(fd);
break;