TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-23 18:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused implementations

Browse Source
This commit is contained in:
topjohnwu 2022-12-23 17:20:39 -08:00
parent 4ed34cd648
commit dadae20960
2 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
native/src/base/files.cpp
View File

@ -382,49 +382,6 @@ void parse_mnt(const char *file, const function<bool(mntent*)> &fn) {
} }
} }
void backup_folder(const char *dir, vector<raw_file> &files) {
char path[PATH_MAX];
xrealpath(dir, path, sizeof(path));
int len = strlen(path);
pre_order_walk(xopen(dir, O_RDONLY), [&](int dfd, dirent *entry) -> walk_result {
int fd = xopenat(dfd, entry->d_name, O_RDONLY);
if (fd < 0)
return SKIP;
run_finally f([&]{ close(fd); });
if (fd_path(fd, byte_slice(path, sizeof(path))) < 0)
return SKIP;
raw_file file;
file.path = path + len + 1;
if (fgetattr(fd, &file.attr) < 0)
return SKIP;
if (entry->d_type == DT_REG) {
file.content = full_read(fd);
} else if (entry->d_type == DT_LNK) {
xreadlinkat(dfd, entry->d_name, path, sizeof(path));
file.content = path;
}
files.emplace_back(std::move(file));
return CONTINUE;
});
}
void restore_folder(const char *dir, vector<raw_file> &files) {
string base(dir);
// Pre-order means folders will always be first
for (raw_file &file : files) {
string path = base + "/" + file.path;
if (S_ISDIR(file.attr.st.st_mode)) {
mkdirs(path.data(), 0);
} else if (S_ISREG(file.attr.st.st_mode)) {
if (auto fp = xopen_file(path.data(), "we"))
fwrite(file.content.data(), 1, file.content.size(), fp.get());
} else if (S_ISLNK(file.attr.st.st_mode)) {
symlink(file.content.data(), path.data());
}
setattr(path.data(), &file.attr);
}
}
sDIR make_dir(DIR *dp) { sDIR make_dir(DIR *dp) {
return sDIR(dp, [](DIR *dp){ return dp ? closedir(dp) : 1; }); return sDIR(dp, [](DIR *dp){ return dp ? closedir(dp) : 1; });
} }
@ -491,10 +448,10 @@ mmap_data::mmap_data(const char *name, bool rw) {
string find_apk_path(const char *pkg) { string find_apk_path(const char *pkg) {
char buf[PATH_MAX]; char buf[PATH_MAX];
size_t len = strlen(pkg);
pre_order_walk(xopen("/data/app", O_RDONLY), [&](int dfd, dirent *entry) -> walk_result { pre_order_walk(xopen("/data/app", O_RDONLY), [&](int dfd, dirent *entry) -> walk_result {
if (entry->d_type != DT_DIR) if (entry->d_type != DT_DIR)
return SKIP; return SKIP;
size_t len = strlen(pkg);
if (strncmp(entry->d_name, pkg, len) == 0 && entry->d_name[len] == '-') { if (strncmp(entry->d_name, pkg, len) == 0 && entry->d_name[len] == '-') {
fd_pathat(dfd, entry->d_name, buf, sizeof(buf)); fd_pathat(dfd, entry->d_name, buf, sizeof(buf));
return ABORT; return ABORT;

12
native/src/base/files.hpp
View File

@ -39,16 +39,6 @@ protected:
void swap(byte_data &o); void swap(byte_data &o);
}; };
struct raw_file {
std::string path;
file_attr attr;
std::string content;
raw_file() : attr{} {}
raw_file(const raw_file&) = delete;
raw_file(raw_file &&o) : path(std::move(o.path)), attr(o.attr), content(std::move(o.content)) {}
};
struct mmap_data : public byte_data { struct mmap_data : public byte_data {
mmap_data() = default; mmap_data() = default;
mmap_data(const mmap_data&) = delete; mmap_data(const mmap_data&) = delete;
@ -99,8 +89,6 @@ void parse_prop_file(const char *file,
void frm_rf(int dirfd); void frm_rf(int dirfd);
void clone_dir(int src, int dest); void clone_dir(int src, int dest);
void parse_mnt(const char *file, const std::function<bool(mntent*)> &fn); void parse_mnt(const char *file, const std::function<bool(mntent*)> &fn);
void backup_folder(const char *dir, std::vector<raw_file> &files);
void restore_folder(const char *dir, std::vector<raw_file> &files);
std::string find_apk_path(const char *pkg); std::string find_apk_path(const char *pkg);
using sFILE = std::unique_ptr<FILE, decltype(&fclose)>; using sFILE = std::unique_ptr<FILE, decltype(&fclose)>;