TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 07:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check/fix ext4 image before mounting

Browse Source
This commit is contained in:
topjohnwu 2017-06-30 23:22:26 +08:00
parent 47c0084641
commit 8767a88854
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jni/utils/img.c
View File

@ -45,7 +45,7 @@ int get_img_size(const char *img, int *used, int *total) {
if (pid == -1) if (pid == -1)
return 1; return 1;
while (fdgets(buffer, sizeof(buffer), fd)) { while (fdgets(buffer, sizeof(buffer), fd)) {
LOGD("magisk_img: %s", buffer); // LOGD("magisk_img: %s", buffer);
if (strstr(buffer, img)) { if (strstr(buffer, img)) {
char *tok = strtok(buffer, ","); char *tok = strtok(buffer, ",");
while(tok != NULL) { while(tok != NULL) {
@ -108,12 +108,25 @@ char *loopsetup(const char *img) {
} }
char *mount_image(const char *img, const char *target) { char *mount_image(const char *img, const char *target) {
if (access(img, F_OK) == -1)
return NULL;
if (access(target, F_OK) == -1) { if (access(target, F_OK) == -1) {
if (mkdir(target, 0755) == -1) { if (xmkdir(target, 0755) == -1) {
xmount(NULL, "/", NULL, MS_REMOUNT, NULL); xmount(NULL, "/", NULL, MS_REMOUNT, NULL);
xmkdir(target, 0755); xmkdir(target, 0755);
xmount(NULL, "/", NULL, MS_REMOUNT | MS_RDONLY, NULL);
} }
} }
// Check and repair ext4 image
char buffer[PATH_MAX];
snprintf(buffer, sizeof(buffer), "e2fsck -yf %s", img);
int fd = 0;
char *const command[] = { "sh", "-c", buffer, NULL };
if (run_command(1, &fd, "/system/bin/sh", command) == -1)
return NULL;
while (fdgets(buffer, sizeof(buffer), fd))
LOGD("magisk_img: %s", buffer);
close(fd);
char *device = loopsetup(img); char *device = loopsetup(img);
if (device) if (device)
xmount(device, target, "ext4", 0, NULL); xmount(device, target, "ext4", 0, NULL);