/* Selection of files to include/exclude in the snapshot. */
std::list<string> includes; // Paths in which files should be saved
std::list<string> excludes; // Paths which will not be saved
+std::list<string> excluded_names; // Directories which will not be saved
std::list<string> searches; // Directories we don't want to save, but
// do want to descend searching for data
// in included paths
subfile.analyze_new_block(block_buf, bytes);
refs = subfile.create_incremental(tss, o, block_age);
} else {
+ if (flag_rebuild_statcache && ref.is_normal()) {
+ subfile.analyze_new_block(block_buf, bytes);
+ subfile.store_analyzed_signatures(ref);
+ }
refs.push_back(ref);
}
// the checksum in the statcache. If not, we have possible disk corruption
// and report a warning.
if (flag_rebuild_statcache) {
- if (found && file_info["checksum"] != metawriter->get_checksum()) {
+ if (found
+ && metawriter->is_unchanged(&stat_buf)
+ && file_info["checksum"] != metawriter->get_checksum()) {
fprintf(stderr,
"Warning: Checksum for %s does not match expected value\n"
" expected: %s\n"
file_info["volatile"] = "1";
struct passwd *pwd = getpwuid(stat_buf.st_uid);
- if (pwd != NULL) {
+ if (pwd != NULL && pwd->pw_name != NULL) {
file_info["user"] += " (" + uri_encode(pwd->pw_name) + ")";
}
struct group *grp = getgrgid(stat_buf.st_gid);
- if (pwd != NULL) {
+ if (grp != NULL && grp->gr_name != NULL) {
file_info["group"] += " (" + uri_encode(grp->gr_name) + ")";
}
}
}
+ if (excluded_names.size() > 0) {
+ std::string name = path;
+ std::string::size_type last_slash = name.rfind('/');
+ if (last_slash != std::string::npos) {
+ name.replace(0, last_slash + 1, "");
+ }
+
+ for (list<string>::iterator i = excluded_names.begin();
+ i != excluded_names.end(); ++i) {
+ if (name == *i) {
+ include = false;
+ }
+ }
+ }
+
for (list<string>::iterator i = searches.begin();
i != searches.end(); ++i) {
if (path == *i) {
" --upload-script=COMMAND\n"
" program to invoke for each backup file generated\n"
" --exclude=PATH exclude files in PATH from snapshot\n"
+ " --exclude-name=NAME exclude files called NAME from snapshot\n"
" --localdb=PATH local backup metadata is stored in PATH\n"
" --tmpdir=PATH path for temporarily storing backup files\n"
" (defaults to TMPDIR environment variable or /tmp)\n"
" --intent=FLOAT intended backup type: 1=daily, 7=weekly, ...\n"
" (defaults to \"1\")\n"
" --full-metadata do not re-use metadata from previous backups\n"
+ " --rebuild-statcache re-read all file data to verify statcache\n"
" -v --verbose list files as they are backed up\n"
"\n"
"Exactly one of --dest or --upload-script must be specified.\n",
{"tmpdir", 1, 0, 0}, // 9
{"upload-script", 1, 0, 0}, // 10
{"rebuild-statcache", 0, 0, 0}, // 11
+ {"exclude-name", 1, 0, 0}, // 12
// Aliases for short options
{"verbose", 0, 0, 'v'},
{NULL, 0, 0, 0},
case 11: // --rebuild-statcache
flag_rebuild_statcache = true;
break;
+ case 12: // --exclude-name
+ excluded_names.push_back(optarg);
+ break;
default:
fprintf(stderr, "Unhandled long option!\n");
return 1;
tmp_dir.c_str());
return 1;
}
- remote = new RemoteStore(tmp_dir);
- remote->set_script(backup_script);
+ remote = new RemoteStore(tmp_dir, backup_script=backup_script);
} else {
remote = new RemoteStore(backup_dest);
}
waitpid(signature_pid, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
- throw IOException("Signature filter process error");
+ fatal("Signature filter process error");
}
}