Merge branch 'GT-3012_ryanmkurtz_PR-797_dev747368_windows_batch_import_path'

This commit is contained in:
Ryan Kurtz 2019-07-17 14:49:46 -04:00
commit ac474530f4

View file

@ -15,7 +15,10 @@
*/
package ghidra.formats.gfilesystem;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import org.apache.commons.io.FilenameUtils;
@ -394,7 +397,8 @@ public class FileSystemService {
* @return {@link FSRL} pointing to the same file, never null
*/
public FSRL getLocalFSRL(File f) {
return localFS.getFSRL().withPath(FilenameUtils.separatorsToUnix(f.getPath()));
return localFS.getFSRL().withPath(
FSUtilities.appendPath("/", FilenameUtils.separatorsToUnix(f.getPath())));
}
/**