MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare compilation for NDK r21

Browse Source
This commit is contained in:
topjohnwu 2020-04-03 02:58:39 -07:00
parent 2742edd73f
commit 2f1f68f12f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/external/busybox vendored

@ -1 +1 @@
Subproject commit 172151eb0dd8c774459beaf6b116c63f8cf528aa Subproject commit 04d8621fd3eb6d5e2863924daca49d37f89a2f09

6
native/jni/init/init.cpp
View File

@ -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() {
} }
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) {
} }
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)))

2
native/jni/systemproperties/prop_info.cpp
View File

@ -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));