mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-13 08:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only explicitly load zlib and libewf from windows.

Browse Source
This commit is contained in:
Jeff Wallace 2013-11-21 11:05:20 -05:00
parent f4d33150f0
commit 1e71d7397d
1 changed files with 27 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Core/src/org/sleuthkit/autopsy/core/Installer.java
View File

@ -44,49 +44,34 @@ public class Installer extends ModuleInstall {
} }
private static void loadDynLibraries() { private static void loadDynLibraries() {
if (PlatformUtil.isWindowsOS()) { if (PlatformUtil.isWindowsOS()) {
try { try {
//on windows force loading ms crt dependencies first //on windows force loading ms crt dependencies first
//in case linker can't find them on some systems //in case linker can't find them on some systems
//Note: if shipping with a different CRT version, this will only print a warning //Note: if shipping with a different CRT version, this will only print a warning
//and try to use linker mechanism to find the correct versions of libs. //and try to use linker mechanism to find the correct versions of libs.
//We should update this if we officially switch to a new version of CRT/compiler //We should update this if we officially switch to a new version of CRT/compiler
System.loadLibrary("msvcr100"); System.loadLibrary("msvcr100");
System.loadLibrary("msvcp100"); System.loadLibrary("msvcp100");
logger.log(Level.INFO, "MS CRT libraries loaded"); logger.log(Level.INFO, "MS CRT libraries loaded");
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading ms crt libraries, ", e); logger.log(Level.SEVERE, "Error loading ms crt libraries, ", e);
} }
try {
System.loadLibrary("zlib");
logger.log(Level.INFO, "ZLIB library loaded loaded");
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading ZLIB library, ", e);
}
try {
System.loadLibrary("libewf");
logger.log(Level.INFO, "EWF library loaded");
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading EWF library, ", e);
}
} }
try {
System.loadLibrary("zlib");
logger.log(Level.INFO, "ZLIB library loaded loaded");
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading ZLIB library, ", e);
}
try {
System.loadLibrary("libewf");
logger.log(Level.INFO, "EWF library loaded");
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading EWF library, ", e);
}
/* We should rename the Windows dll, to remove the lib prefix.
*/
// try {
// String tskLibName = null;
// if (PlatformUtil.isWindowsOS()) {
// tskLibName = "libtsk_jni";
// } else {
// tskLibName = "tsk_jni";
// }
// System.loadLibrary(tskLibName);
// logger.log(Level.INFO, "TSK_JNI library loaded");
// } catch (UnsatisfiedLinkError e) {
// logger.log(Level.SEVERE, "Error loading tsk_jni library", e);
// }
} }
public Installer() { public Installer() {