yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

GP-4358: No longer using XDG_RUNTIME_DIR for temp directory. Ubuntu

Browse source 
defaults it to a too small tmpfs. (Closes #6233)
This commit is contained in:
Ryan Kurtz 2024-02-23 08:12:36 -05:00
parent 2ce8463657
commit c5bad0a88f
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/Utility/src/main/java/utility/application/AppCleaner.java
View file

@ -246,7 +246,9 @@ public class AppCleaner implements GhidraLaunchable {
getDirFromProperty(PROPERTY_TEMP_DIR, appName).ifPresent(discoveredDirs::add); getDirFromProperty(PROPERTY_TEMP_DIR, appName).ifPresent(discoveredDirs::add);
getDirFromProperty(PROPERTY_TEMP_DIR, userNameAndAppName).ifPresent(discoveredDirs::add); getDirFromProperty(PROPERTY_TEMP_DIR, userNameAndAppName).ifPresent(discoveredDirs::add);
// XDG environment variable override // XDG environment variable override.
// This was used briefly in the master branch and then removed, so some users might have
// this artifact. We can eventually stop looking here.
getDirFromEnv(XDG_RUNTIME_DIR, appName).ifPresent(discoveredDirs::add); getDirFromEnv(XDG_RUNTIME_DIR, appName).ifPresent(discoveredDirs::add);
getDirFromEnv(XDG_RUNTIME_DIR, userNameAndAppName).ifPresent(discoveredDirs::add); getDirFromEnv(XDG_RUNTIME_DIR, userNameAndAppName).ifPresent(discoveredDirs::add);

7
Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java
View file

@ -176,13 +176,6 @@ public class ApplicationUtilities {
new File(tempOverrideDir, getUserSpecificDirName(tempOverrideDir, appName))); new File(tempOverrideDir, getUserSpecificDirName(tempOverrideDir, appName)));
} }
// Look for XDG environment variable
File xdgRuntimeDir = getEnvFile(XdgUtils.XDG_RUNTIME_DIR, false);
if (xdgRuntimeDir != null) {
return createDir(
new File(xdgRuntimeDir, getUserSpecificDirName(xdgRuntimeDir, appName)));
}
File javaTmpDir = getJavaTmpDir(); File javaTmpDir = getJavaTmpDir();
return createDir(new File(getJavaTmpDir(), getUserSpecificDirName(javaTmpDir, appName))); return createDir(new File(getJavaTmpDir(), getUserSpecificDirName(javaTmpDir, appName)));
} }

3
Ghidra/RuntimeScripts/Common/support/launch.properties
View file

@ -116,8 +116,7 @@ VMARGS=-Xshare:off
# directory lives outside of the user's home directory. The temporary directory will be selected # directory lives outside of the user's home directory. The temporary directory will be selected
# based on the following rules, in order of precedence: # based on the following rules, in order of precedence:
# 1. System.getProperty("application.tempdir")/[user-]<application> # 1. System.getProperty("application.tempdir")/[user-]<application>
# 2. System.getenv("XDG_RUNTIME_DIR")/[user-]<application> # 2. System.getProperty("java.io.tmpdir")/[user-]<application>
# 3. System.getProperty("java.io.tmpdir")/[user-]<application>
# Unless overridden below, the "java.io.tmpdir" system property typically defaults to the following # Unless overridden below, the "java.io.tmpdir" system property typically defaults to the following
# platform specific locations: # platform specific locations:
# - Windows: %TEMP% # - Windows: %TEMP%