bool relative_paths = true;
+/* Whether verbose output is enabled. */
+bool verbose = false;
+
/* Ensure that the given segment is listed as a dependency of the current
* snapshot. */
void add_segment(const string& segment)
file_info["checksum"] = hash.checksum_str();
}
- if (status != NULL)
+ if (verbose && status != NULL)
printf(" [%s]\n", status);
string blocklist = "";
int64_t file_size;
ssize_t len;
- printf("%s\n", path.c_str());
+ if (verbose)
+ printf("%s\n", path.c_str());
metawriter->find(path);
file_info["name"] = uri_encode(path);
" --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"
+ " -v --verbose list files as they are backed up\n"
"\n"
"Exactly one of --dest or --upload-script must be specified.\n",
cumulus_version, program
{"full-metadata", 0, 0, 0}, // 8
{"tmpdir", 1, 0, 0}, // 9
{"upload-script", 1, 0, 0}, // 10
+ // Aliases for short options
+ {"verbose", 0, 0, 'v'},
{NULL, 0, 0, 0},
};
int long_index;
- int c = getopt_long(argc, argv, "", long_options, &long_index);
+ int c = getopt_long(argc, argv, "v", long_options, &long_index);
if (c == -1)
break;
return 1;
}
} else {
- usage(argv[0]);
- return 1;
+ switch (c) {
+ case 'v':
+ verbose = true;
+ break;
+ default:
+ usage(argv[0]);
+ return 1;
+ }
}
}
}
}
fclose(checksums);
+
+ SHA1Checksum checksum_csum;
+ string csum;
+ checksum_filename = checksum_file->get_local_path();
+ if (checksum_csum.process_file(checksum_filename.c_str())) {
+ csum = checksum_csum.checksum_str();
+ }
+
checksum_file->send();
db->Close();
fprintf(descriptor, "Backup-Intent: %g\n", snapshot_intent);
fprintf(descriptor, "Root: %s\n", backup_root.c_str());
- SHA1Checksum checksum_csum;
- if (checksum_csum.process_file(checksum_filename.c_str())) {
- string csum = checksum_csum.checksum_str();
+ if (csum.size() > 0) {
fprintf(descriptor, "Checksums: %s\n", csum.c_str());
}