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

Merge remote-tracking branch 'origin/patch'

Browse source 
Conflicts:
	Ghidra/application.properties
This commit is contained in:
Ryan Kurtz 2021-10-04 17:45:54 -04:00
commit 45421bcbb9
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java
View file

@ -37,16 +37,19 @@ import agent.gdb.manager.impl.cmd.*;
import agent.gdb.manager.parsing.GdbMiParser;
import agent.gdb.manager.parsing.GdbParsingUtils.GdbParseError;
import agent.gdb.pty.*;
import ghidra.GhidraApplicationLayout;
import ghidra.async.*;
import ghidra.async.AsyncLock.Hold;
import ghidra.dbg.error.DebuggerModelTerminatingException;
import ghidra.dbg.util.HandlerMap;
import ghidra.dbg.util.PrefixMap;
import ghidra.framework.Application;
import ghidra.framework.GhidraApplicationConfiguration;
import ghidra.lifecycle.Internal;
import ghidra.util.Msg;
import ghidra.util.SystemUtilities;
import ghidra.util.datastruct.ListenerSet;
import ghidra.util.task.ConsoleTaskMonitor;
import sun.misc.Signal;
import sun.misc.SignalHandler;
@ -206,7 +209,8 @@ public class GdbManagerImpl implements GdbManager {
private void initLog() {
try {
File userSettings = Application.getUserSettingsDirectory();
GhidraApplicationLayout layout = new GhidraApplicationLayout();
File userSettings = layout.getUserSettingsDir();
File logFile = new File(userSettings, "GDB.log");
try {
logFile.createNewFile();
@ -216,7 +220,7 @@ public class GdbManagerImpl implements GdbManager {
}
DBG_LOG = new PrintWriter(new FileOutputStream(logFile));
}
catch (FileNotFoundException e) {
catch (IOException e) {
throw new AssertionError(e);
}
}