github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-04-24 03:00:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

GP-0 corrected GhidraServer text resource file access

Browse Source
This commit is contained in:
ghidra1
2021-06-21 16:07:44 -04:00
parent 51254872ba
commit 11149b9ef2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServer.java
View File

@@ -55,7 +55,6 @@ import ghidra.server.stream.RemoteBlockStreamHandle;
import ghidra.util.SystemUtilities;
import ghidra.util.exception.AssertException;
import ghidra.util.exception.DuplicateNameException;
import resources.ResourceManager;
import utilities.util.FileUtilities;
import utility.application.ApplicationLayout;
@@ -73,7 +72,7 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
private static Logger log;
private static String HELP_FILE = "/ghidra/server/remote/ServerHelp.txt";
private static String HELP_FILE = "ServerHelp.txt";
private static String USAGE_ARGS =
"[-ip <hostname>] [-i #.#.#.#] [-p#] [-n] [-a#] [-d<ad_domain>] [-e<days>] [-jaas <config_file>] [-u] [-autoProvision] [-anonymous] [-ssh] <repository_path>";
@@ -411,7 +410,7 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
private static void displayHelp() {
try (InputStream in = ResourceManager.getResourceAsStream(HELP_FILE)) {
try (InputStream in = GhidraServer.class.getResourceAsStream(HELP_FILE)) {
List<String> lines = FileUtilities.getLines(in);
lines.stream().forEach(s -> System.out.println(s));
}