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

Trim dev name

Browse Source
This commit is contained in:
vvb2060 2019-02-26 16:04:17 +08:00 committed by John Wu
parent 7b089b888a
commit f152bea8d8
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/core/init.cpp
View File

@ -205,7 +205,7 @@ static bool read_fstab_dt(const struct cmdline *cmd, const char *mnt_point, char
if ((fd = xopen(buf, O_RDONLY | O_CLOEXEC)) >= 0) {
read(fd, buf, sizeof(buf));
close(fd);
char *name = strrchr(buf, '/') + 1;
char *name = rtrim(strrchr(buf, '/') + 1);
sprintf(partname, "%s%s", name, strend(name, cmd->slot) ? cmd->slot : "");
sprintf(buf, "%s/fstab/%s/type", cmd->dt_dir, mnt_point);
if ((fd = xopen(buf, O_RDONLY | O_CLOEXEC)) >= 0) {

1
native/jni/utils/include/utils.h
View File

@ -79,6 +79,7 @@ int fork_dont_care();
int fork_no_zombie();
void gen_rand_str(char *buf, int len);
int strend(const char *s1, const char *s2);
char *rtrim(char *str);
void init_argv0(int argc, char **argv);
void set_nice_name(const char *name);

8
native/jni/utils/misc.cpp
View File

@ -222,3 +222,11 @@ bool ends_with(const std::string_view &s1, const std::string_view &s2) {
unsigned l2 = s2.length();
return l1 < l2 ? false : s1.compare(l1 - l2, l2, s2) == 0;
}
char *rtrim(char *str) {
int len = strlen(str);
while (len > 0 && str[len - 1] == ' ')
--len;
str[len] = '\0';
return str;
}