LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only apply permission to files with +x

Browse Source 
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
This commit is contained in:
Xavier Ducrohet
2009-10-30 16:34:47 -07:00
parent 41c271bb20
commit 67ba2de9e7
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
View File

@@ -807,8 +807,12 @@ public class Archive implements IDescription {
} }
// if needed set the permissions. // if needed set the permissions.
if (usingUnixPerm) { if (usingUnixPerm && destFile.isFile()) {
setPermission(destFile, entry.getUnixMode()); // get the mode and test if it contains the executable bit
int mode = entry.getUnixMode();
if ((mode & 0111) != 0) {
setExecutablePermission(destFile);
}
} }
// Increment progress bar to match. We update only between files. // Increment progress bar to match. We update only between files.
@@ -928,19 +932,14 @@ public class Archive implements IDescription {
} }
/** /**
* Sets the Unix permission on a file or folder. * Sets the executable Unix permission (0777) on a file or folder.
* @param file The file to set permissions on. * @param file The file to set permissions on.
* @param unixMode the permissions as received from {@link ZipArchiveEntry#getUnixMode()}. * @param unixMode the permissions as received from {@link ZipArchiveEntry#getUnixMode()}.
* @throws IOException * @throws IOException
*/ */
private void setPermission(File file, int unixMode) throws IOException { private void setExecutablePermission(File file) throws IOException {
// permissions contains more than user/group/all, and we need the 777 display mode, so we
// convert it in octal string and take the last 3 digits.
String permission = String.format("%o", unixMode);
permission = permission.substring(permission.length() - 3, permission.length());
Runtime.getRuntime().exec(new String[] { Runtime.getRuntime().exec(new String[] {
"chmod", permission, file.getAbsolutePath() "chmod", "777", file.getAbsolutePath()
}); });
} }
} }