Commit 2f1f68f1 authored by topjohnwu's avatar topjohnwu

Prepare compilation for NDK r21

parent 2742edd7
Subproject commit 172151eb0dd8c774459beaf6b116c63f8cf528aa Subproject commit 04d8621fd3eb6d5e2863924daca49d37f89a2f09
...@@ -102,7 +102,7 @@ static void decompress_ramdisk() { ...@@ -102,7 +102,7 @@ static void decompress_ramdisk() {
uint8_t *buf; uint8_t *buf;
size_t sz; size_t sz;
mmap_ro(ramdisk_xz, buf, sz); mmap_ro(ramdisk_xz, buf, sz);
int fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC); int fd = xopen(tmp, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
unxz(fd, buf, sz); unxz(fd, buf, sz);
munmap(buf, sz); munmap(buf, sz);
close(fd); close(fd);
...@@ -113,7 +113,7 @@ static void decompress_ramdisk() { ...@@ -113,7 +113,7 @@ static void decompress_ramdisk() {
} }
int dump_magisk(const char *path, mode_t mode) { int dump_magisk(const char *path, mode_t mode) {
int fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, mode); int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, mode);
if (fd < 0) if (fd < 0)
return 1; return 1;
if (!unxz(fd, magisk_xz, sizeof(magisk_xz))) if (!unxz(fd, magisk_xz, sizeof(magisk_xz)))
...@@ -123,7 +123,7 @@ int dump_magisk(const char *path, mode_t mode) { ...@@ -123,7 +123,7 @@ int dump_magisk(const char *path, mode_t mode) {
} }
static int dump_manager(const char *path, mode_t mode) { static int dump_manager(const char *path, mode_t mode) {
int fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, mode); int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, mode);
if (fd < 0) if (fd < 0)
return 1; return 1;
if (!unxz(fd, manager_xz, sizeof(manager_xz))) if (!unxz(fd, manager_xz, sizeof(manager_xz)))
......
...@@ -47,7 +47,7 @@ prop_info::prop_info(const char* name, uint32_t namelen, uint32_t long_offset) { ...@@ -47,7 +47,7 @@ prop_info::prop_info(const char* name, uint32_t namelen, uint32_t long_offset) {
memcpy(this->name, name, namelen); memcpy(this->name, name, namelen);
this->name[namelen] = '\0'; this->name[namelen] = '\0';
auto error_value_len = sizeof(kLongLegacyError) - 1; atomic_uint_least32_t error_value_len = sizeof(kLongLegacyError) - 1;
atomic_init(&this->serial, error_value_len << 24 | kLongFlag); atomic_init(&this->serial, error_value_len << 24 | kLongFlag);
memcpy(this->long_property.error_message, kLongLegacyError, sizeof(kLongLegacyError)); memcpy(this->long_property.error_message, kLongLegacyError, sizeof(kLongLegacyError));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment