diff --git a/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel b/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel index 9593566e142..6d1e3656423 100644 --- a/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel +++ b/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel @@ -205,6 +205,7 @@ cf_cc_library( "//cuttlefish/host/libs/zip/libzip_cc:writable_source", "//cuttlefish/posix:strerror", "//cuttlefish/result", + "@abseil-cpp//absl/log", ], ) diff --git a/base/cvd/cuttlefish/host/libs/zip/libzip_cc/BUILD.bazel b/base/cvd/cuttlefish/host/libs/zip/libzip_cc/BUILD.bazel index aacb33e28c8..44d145a7441 100644 --- a/base/cvd/cuttlefish/host/libs/zip/libzip_cc/BUILD.bazel +++ b/base/cvd/cuttlefish/host/libs/zip/libzip_cc/BUILD.bazel @@ -20,6 +20,7 @@ cf_cc_library( "//cuttlefish/host/libs/zip/libzip_cc:seekable_source", "//cuttlefish/host/libs/zip/libzip_cc:writable_source", "//cuttlefish/result", + "@abseil-cpp//absl/log", "@libzip", "@zlib", ], diff --git a/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.cc b/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.cc index adddee97f22..f01d22ea34e 100644 --- a/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.cc +++ b/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.cc @@ -24,6 +24,7 @@ #include #include +#include "absl/log/log.h" #include "zip.h" #include "cuttlefish/host/libs/zip/libzip_cc/error.h" @@ -85,7 +86,10 @@ Result ReadableZip::EntryUnixAttributes(uint64_t index) { int res = zip_file_get_external_attributes(raw_zip, index, 0, &opsys, &attributes); CF_EXPECT_EQ(res, 0, ZipErrorString(raw_zip)); - CF_EXPECT_EQ(opsys, ZIP_OPSYS_UNIX); + if (opsys != ZIP_OPSYS_UNIX) { + LOG(WARNING) << "Unexpected zip file external attribute. Expected: \"" + << ZIP_OPSYS_UNIX << "\" and found \"" << opsys << "\""; + } return attributes; } diff --git a/base/cvd/cuttlefish/host/libs/zip/zip_file.cc b/base/cvd/cuttlefish/host/libs/zip/zip_file.cc index 525b06aa134..52a6bda1ecc 100644 --- a/base/cvd/cuttlefish/host/libs/zip/zip_file.cc +++ b/base/cvd/cuttlefish/host/libs/zip/zip_file.cc @@ -22,6 +22,8 @@ #include #include +#include "absl/log/log.h" + #include "cuttlefish/common/libs/utils/files.h" #include "cuttlefish/host/libs/zip/libzip_cc/archive.h" #include "cuttlefish/host/libs/zip/libzip_cc/readable_source.h" @@ -68,7 +70,13 @@ Result ExtractFile(ReadableZip& zip, const std::string& zip_path, Result attributes = zip.EntryUnixAttributes(index); if (attributes.ok()) { uint32_t mode = (*attributes >> 16) & 0777; + LOG(ERROR) << "\n\nTODO CJR\n" + << "successful EntryUnixAttributes with mode:" << mode; CF_EXPECT_EQ(chmod(host_path.c_str(), mode), 0, StrError(errno)); + } else { + LOG(ERROR) << "\n\nTODO CJR\n" + << "failed EntryUnixAttributes with:\n" + << attributes.error(); } return {}; }