PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Really fix TWFunc::tw_chmod() for 3-character mode string

Browse Source 
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>

Change-Id: I8f03d46235e1c71e8ee510309c9418cde802f50b
This commit is contained in:
Vojtech Bocek
2013-08-29 22:38:20 +02:00
committed by Gerrit Code Review
parent 72e9554261
commit 37aeb8d678
2 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twrp-functions.cpp
+41 -32
View File
@@ -621,101 +621,110 @@ bool TWFunc::Fix_su_Perms(void) {
return true;
}
int TWFunc::tw_chmod(string fn, string mode) {
int TWFunc::tw_chmod(const string& fn, const string& mode) {
long mask = 0;
std::string::size_type n = mode.length();
int cls = 0;
std::string::size_type n = (mode.length() == 3) ? 1 : 0;
for (; n < mode.length(); ++n) {
if (n == 0) {
if(n == 3)
++cls;
else if(n != 4)
{
LOGERR("TWFunc::tw_chmod used with %u long mode string (should be 3 or 4)!\n", mode.length());
return -1;
}
for (n = 0; n < mode.length(); ++n, ++cls) {
if (cls == 0) {
if (mode[n] == '0')
continue;
if (mode[n] == '1')
else if (mode[n] == '1')
mask |= S_ISVTX;
if (mode[n] == '2')
else if (mode[n] == '2')
mask |= S_ISGID;
if (mode[n] == '4')
else if (mode[n] == '4')
mask |= S_ISUID;
if (mode[n] == '5') {
else if (mode[n] == '5') {
mask |= S_ISVTX;
mask |= S_ISUID;
}
if (mode[n] == '6') {
else if (mode[n] == '6') {
mask |= S_ISGID;
mask |= S_ISUID;
}
if (mode[n] == '7') {
else if (mode[n] == '7') {
mask |= S_ISVTX;
mask |= S_ISGID;
mask |= S_ISUID;
}
}
else if (n == 1) {
else if (cls == 1) {
if (mode[n] == '7') {
mask |= S_IRWXU;
}
if (mode[n] == '6') {
else if (mode[n] == '6') {
mask |= S_IRUSR;
mask |= S_IWUSR;
}
if (mode[n] == '5') {
else if (mode[n] == '5') {
mask |= S_IRUSR;
mask |= S_IXUSR;
}
if (mode[n] == '4')
else if (mode[n] == '4')
mask |= S_IRUSR;
if (mode[n] == '3') {
else if (mode[n] == '3') {
mask |= S_IWUSR;
mask |= S_IRUSR;
}
if (mode[n] == '2')
else if (mode[n] == '2')
mask |= S_IWUSR;
if (mode[n] == '1')
else if (mode[n] == '1')
mask |= S_IXUSR;
}
else if (n == 2) {
else if (cls == 2) {
if (mode[n] == '7') {
mask |= S_IRWXG;
}
if (mode[n] == '6') {
else if (mode[n] == '6') {
mask |= S_IRGRP;
mask |= S_IWGRP;
}
if (mode[n] == '5') {
else if (mode[n] == '5') {
mask |= S_IRGRP;
mask |= S_IXGRP;
}
if (mode[n] == '4')
else if (mode[n] == '4')
mask |= S_IRGRP;
if (mode[n] == '3') {
else if (mode[n] == '3') {
mask |= S_IWGRP;
mask |= S_IXGRP;
}
if (mode[n] == '2')
else if (mode[n] == '2')
mask |= S_IWGRP;
if (mode[n] == '1')
else if (mode[n] == '1')
mask |= S_IXGRP;
}
else if (n == 3) {
else if (cls == 3) {
if (mode[n] == '7') {
mask |= S_IRWXO;
}
if (mode[n] == '6') {
else if (mode[n] == '6') {
mask |= S_IROTH;
mask |= S_IWOTH;
}
if (mode[n] == '5') {
else if (mode[n] == '5') {
mask |= S_IROTH;
mask |= S_IXOTH;
}
if (mode[n] == '4')
mask |= S_IROTH;
if (mode[n] == '3') {
else if (mode[n] == '4')
mask |= S_IROTH;
else if (mode[n] == '3') {
mask |= S_IWOTH;
mask |= S_IXOTH;
}
if (mode[n] == '2')
else if (mode[n] == '2')
mask |= S_IWOTH;
if (mode[n] == '1')
else if (mode[n] == '1')
mask |= S_IXOTH;
}
}
twrp-functions.hpp
+1 -1
View File
@@ -48,7 +48,7 @@ public:
static int drop_caches(void); //drop linux cache memory
static int Check_su_Perms(void); // check perms and owner of su binary in various locations
static bool Fix_su_Perms(void); // sets proper permissions for su binaries and superuser apk
static int tw_chmod(string fn, string mode); // chmod function that converts a 4 char string into st_mode automatically
static int tw_chmod(const string& fn, const string& mode); // chmod function that converts a 3 or 4 char string into st_mode automatically
static bool Install_SuperSU(void); // Installs su binary and apk and sets proper permissions
static vector<string> split_string(const string &in, char del, bool skip_empty);
static int Get_File_Type(string fn); // Determines file type, 0 for unknown, 1 for gzip, 2 for OAES encrypted