ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libsnapshot: Allow inspect_cow to show failed blocks" am: 82129fd4ce am: 2377825899

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673894

Change-Id: I0950b60a2206f192d2816e47129987b27c16b52c
This commit is contained in:
Daniel Rosenberg 2021-04-30 06:05:16 +00:00 • committed by Automerger Merge Worker
commit 1a24b1fcde
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
fs_mgr/libsnapshot/inspect_cow.cpp
View file

@ -38,7 +38,8 @@ void MyLogger(android::base::LogId, android::base::LogSeverity severity, const c
static void usage(void) {
LOG(ERROR) << "Usage: inspect_cow [-sd] <COW_FILE>";
LOG(ERROR) << "\t -s Run Silent";
LOG(ERROR) << "\t -d Attempt to decompress\n";
LOG(ERROR) << "\t -d Attempt to decompress";
LOG(ERROR) << "\t -b Show data for failed decompress\n";
}
// Sink that always appends to the end of a string.
@ -59,7 +60,25 @@ class StringSink : public IByteSink {
std::string stream_;
};
static bool Inspect(const std::string& path, bool silent, bool decompress) {
static void ShowBad(CowReader& reader, const struct CowOperation& op) {
size_t count;
auto buffer = std::make_unique<uint8_t[]>(op.data_length);
if (!reader.GetRawBytes(op.source, buffer.get(), op.data_length, &count)) {
std::cerr << "Failed to read at all!\n";
} else {
std::cout << "The Block data is:\n";
for (int i = 0; i < op.data_length; i++) {
std::cout << std::hex << (int)buffer[i];
}
std::cout << std::dec << "\n\n";
if (op.data_length >= sizeof(CowOperation)) {
std::cout << "The start, as an op, would be " << *(CowOperation*)buffer.get() << "\n";
}
}
}
static bool Inspect(const std::string& path, bool silent, bool decompress, bool show_bad) {
android::base::unique_fd fd(open(path.c_str(), O_RDONLY));
if (fd < 0) {
PLOG(ERROR) << "open failed: " << path;
@ -107,6 +126,7 @@ static bool Inspect(const std::string& path, bool silent, bool decompress) {
if (!reader.ReadData(op, &sink)) {
std::cerr << "Failed to decompress for :" << op << "\n";
success = false;
if (show_bad) ShowBad(reader, op);
}
sink.Reset();
}
@ -124,7 +144,8 @@ int main(int argc, char** argv) {
int ch;
bool silent = false;
bool decompress = false;
while ((ch = getopt(argc, argv, "sd")) != -1) {
bool show_bad = false;
while ((ch = getopt(argc, argv, "sdb")) != -1) {
switch (ch) {
case 's':
silent = true;
@ -132,6 +153,9 @@ int main(int argc, char** argv) {
case 'd':
decompress = true;
break;
case 'b':
show_bad = true;
break;
default:
android::snapshot::usage();
}
@ -143,7 +167,7 @@ int main(int argc, char** argv) {
return 1;
}
if (!android::snapshot::Inspect(argv[optind], silent, decompress)) {
if (!android::snapshot::Inspect(argv[optind], silent, decompress, show_bad)) {
return 1;
}
return 0;