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

GP-1541: All GhidraScript print methods now print to the script log file

Browse source
This commit is contained in:
Ryan Kurtz 2021-11-24 10:59:34 -05:00
parent 4fc2de8841
commit 39eb0e42cd
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java
View file

@ -1016,15 +1016,14 @@ public abstract class GhidraScript extends FlatProgramAPI {
public void print(String message) {
// clients using print may add their own newline, which interferes with our logging,
// so, strip it off
String strippedMessage = message;
if (message.endsWith("\r\n")) {
Msg.info(GhidraScript.class, message.substring(0, message.length() - 2));
strippedMessage = message.substring(0, message.length() - 2);
}
else if (message.endsWith("\n")) {
Msg.info(GhidraScript.class, message.substring(0, message.length() - 1));
}
else {
Msg.info(GhidraScript.class, message);
strippedMessage = message.substring(0, message.length() - 1);
}
Msg.info(GhidraScript.class, new ScriptMessage(strippedMessage));
if (isRunningHeadless()) {
return;
@ -1055,7 +1054,7 @@ public abstract class GhidraScript extends FlatProgramAPI {
*/
public void printerr(String message) {
String msgMessage = getScriptName() + "> " + message;
Msg.error(GhidraScript.class, msgMessage);
Msg.error(GhidraScript.class, new ScriptMessage(msgMessage));
if (isRunningHeadless()) {
return;