diff options
author | Paul Crowley <paulcrowley@google.com> | 2018-05-24 16:15:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-24 16:15:19 -0700 |
commit | 43c530deb42d739da8fb7faac32d6d006ad167ba (patch) | |
tree | 415649981a89b8974a16b3459b283b39fc44a06c /ext4_utils | |
parent | 6d6b15792cdd2c121eebf679b63e763bf5b30334 (diff) | |
parent | 932eb00d242d4bbb8fedbf07fe8cefd7b4b70ac9 (diff) | |
download | extras-43c530deb42d739da8fb7faac32d6d006ad167ba.tar.gz |
Merge "Make logging much less verbose" into pi-dev
am: 932eb00d24
Change-Id: I68dd78a5bd27554362d4400725a1cc66601aec44
Diffstat (limited to 'ext4_utils')
-rw-r--r-- | ext4_utils/ext4_crypt.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ext4_utils/ext4_crypt.cpp b/ext4_utils/ext4_crypt.cpp index bdf80b09..5ec8723b 100644 --- a/ext4_utils/ext4_crypt.cpp +++ b/ext4_utils/ext4_crypt.cpp @@ -76,21 +76,23 @@ bool e4crypt_is_native() { return !strcmp(value, "file"); } -static void log_lslr(const char* dirname) { - std::array<const char*, 3> argv = {"ls", "-lR", dirname}; +static void log_ls(const char* dirname) { + std::array<const char*, 3> argv = {"ls", "-laZ", dirname}; int status = 0; auto res = android_fork_execvp(argv.size(), const_cast<char**>(argv.data()), &status, false, true); if (res != 0) { - PLOG(ERROR) << "ls -lR " << dirname << "failed"; + PLOG(ERROR) << argv[0] << " " << argv[1] << " " << argv[2] << "failed"; return; } if (!WIFEXITED(status)) { - LOG(ERROR) << "ls -lR " << dirname << " did not exit normally, status: " << status; + LOG(ERROR) << argv[0] << " " << argv[1] << " " << argv[2] + << " did not exit normally, status: " << status; return; } if (WEXITSTATUS(status) != 0) { - LOG(ERROR) << "ls -lR " << dirname << " returned failure: " << WEXITSTATUS(status); + LOG(ERROR) << argv[0] << " " << argv[1] << " " << argv[2] + << " returned failure: " << WEXITSTATUS(status); return; } } @@ -201,7 +203,7 @@ static bool e4crypt_policy_get(const char *directory, char *policy, if (ioctl(fd, EXT4_IOC_GET_ENCRYPTION_POLICY, &eep) != 0) { PLOG(ERROR) << "Failed to get encryption policy for " << directory; close(fd); - log_lslr(directory); + log_ls(directory); return false; } close(fd); @@ -240,7 +242,7 @@ static bool e4crypt_policy_check(const char *directory, const char *policy, policy_to_hex(policy, policy_hex); LOG(ERROR) << "Found policy " << existing_policy_hex << " at " << directory << " which doesn't match expected value " << policy_hex; - log_lslr(directory); + log_ls(directory); return false; } LOG(INFO) << "Found policy " << existing_policy_hex << " at " << directory |