Add block rw support

This commit is contained in:
topjohnwu 2017-04-15 18:33:16 +08:00
parent f0751007f3
commit bdcb813ee6
3 changed files with 34 additions and 2 deletions

View File

@ -104,6 +104,9 @@ void start_daemon() {
// Start log monitor // Start log monitor
monitor_logs(); monitor_logs();
// Unlock all blocks for rw
unlock_blocks();
// Loop forever to listen to requests // Loop forever to listen to requests
while(1) { while(1) {
request_handler(xaccept(fd, NULL, NULL)); request_handler(xaccept(fd, NULL, NULL));

View File

@ -9,6 +9,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <pwd.h> #include <pwd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
#include "magisk.h" #include "magisk.h"
#include "utils.h" #include "utils.h"
@ -139,14 +141,40 @@ void ps_filter_proc_name(const char *pattern, void (*func)(int)) {
int create_links(const char *bin, const char *path) { int create_links(const char *bin, const char *path) {
char self[PATH_MAX], linkpath[PATH_MAX]; char self[PATH_MAX], linkpath[PATH_MAX];
if (bin == NULL) { if (bin == NULL) {
xreadlink("/proc/self/exe", self, PATH_MAX); xreadlink("/proc/self/exe", self, sizeof(self));
bin = self; bin = self;
} }
int ret = 0; int ret = 0;
for (int i = 0; applet[i]; ++i) { for (int i = 0; applet[i]; ++i) {
snprintf(linkpath, PATH_MAX, "%s/%s", path, applet[i]); snprintf(linkpath, sizeof(linkpath), "%s/%s", path, applet[i]);
unlink(linkpath); unlink(linkpath);
ret |= symlink(bin, linkpath); ret |= symlink(bin, linkpath);
} }
return ret; return ret;
} }
#define DEV_BLOCK "/dev/block"
void unlock_blocks() {
char path[PATH_MAX];
DIR *dir;
struct dirent *entry;
int fd, OFF = 0;
if (!(dir = xopendir(DEV_BLOCK)))
return;
while((entry = readdir(dir))) {
if (entry->d_type == DT_BLK && strstr(entry->d_name, "mmc") != NULL) {
snprintf(path, sizeof(path), "%s/%s", DEV_BLOCK, entry->d_name);
if ((fd = xopen(path, O_RDONLY)) < 0)
continue;
if (ioctl(fd, BLKROSET, &OFF) == -1)
PLOGE("ioctl");
close(fd);
}
}
closedir(dir);
}

View File

@ -61,5 +61,6 @@ ssize_t fdreadline(int fd, char *buf, size_t size);
void ps(void (*func)(int)); void ps(void (*func)(int));
void ps_filter_proc_name(const char *filter, void (*func)(int)); void ps_filter_proc_name(const char *filter, void (*func)(int));
int create_links(const char *bin, const char *path); int create_links(const char *bin, const char *path);
void unlock_blocks();
#endif #endif