diff options
author | Tao Bao <tbao@google.com> | 2017-12-09 18:27:39 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-09 18:27:39 +0100 |
commit | 9203e77e7d449e55e8eb4a112f6896beb408f5ac (patch) | |
tree | c8b805ff5e40ad81b108c2d26f34b693283c223b /applypatch/applypatch.cpp | |
parent | Merge "add sload.f2fs for recovery format" (diff) | |
parent | applypatch: Remove the 'st' field from FileContents. (diff) | |
download | android_bootable_recovery-9203e77e7d449e55e8eb4a112f6896beb408f5ac.tar android_bootable_recovery-9203e77e7d449e55e8eb4a112f6896beb408f5ac.tar.gz android_bootable_recovery-9203e77e7d449e55e8eb4a112f6896beb408f5ac.tar.bz2 android_bootable_recovery-9203e77e7d449e55e8eb4a112f6896beb408f5ac.tar.lz android_bootable_recovery-9203e77e7d449e55e8eb4a112f6896beb408f5ac.tar.xz android_bootable_recovery-9203e77e7d449e55e8eb4a112f6896beb408f5ac.tar.zst android_bootable_recovery-9203e77e7d449e55e8eb4a112f6896beb408f5ac.zip |
Diffstat (limited to 'applypatch/applypatch.cpp')
-rw-r--r-- | applypatch/applypatch.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 41a72eb15..04b964b17 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -58,12 +58,13 @@ int LoadFileContents(const char* filename, FileContents* file) { return LoadPartitionContents(filename, file); } - if (stat(filename, &file->st) == -1) { + struct stat sb; + if (stat(filename, &sb) == -1) { printf("failed to stat \"%s\": %s\n", filename, strerror(errno)); return -1; } - std::vector<unsigned char> data(file->st.st_size); + std::vector<unsigned char> data(sb.st_size); unique_file f(ota_fopen(filename, "rb")); if (!f) { printf("failed to open \"%s\": %s\n", filename, strerror(errno)); @@ -180,10 +181,6 @@ static int LoadPartitionContents(const std::string& filename, FileContents* file buffer.resize(buffer_size); file->data = std::move(buffer); - // Fake some stat() info. - file->st.st_mode = 0644; - file->st.st_uid = 0; - file->st.st_gid = 0; return 0; } @@ -212,15 +209,6 @@ int SaveFileContents(const char* filename, const FileContents* file) { return -1; } - if (chmod(filename, file->st.st_mode) != 0) { - printf("chmod of \"%s\" failed: %s\n", filename, strerror(errno)); - return -1; - } - if (chown(filename, file->st.st_uid, file->st.st_gid) != 0) { - printf("chown of \"%s\" failed: %s\n", filename, strerror(errno)); - return -1; - } - return 0; } |