github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-10 06:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-6152 allow cancelling via taskmonitor in streamcopy

Browse Source
This commit is contained in:
dev747368
2025-11-20 22:31:14 +00:00
parent 6406339043
commit b19c04f729
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSUtilities.java
View File

@@ -38,6 +38,7 @@ import ghidra.formats.gfilesystem.fileinfo.FileType;
import ghidra.util.*;
import ghidra.util.exception.CancelledException;
import ghidra.util.exception.CryptoException;
import ghidra.util.task.CancelledListener;
import ghidra.util.task.TaskMonitor;
import util.CollectionUtils;
import utilities.util.FileUtilities;
@@ -373,14 +374,21 @@ public class FSUtilities {
byte buffer[] = new byte[FileUtilities.IO_BUFFER_SIZE];
int bytesRead;
long totalBytesCopied = 0;
while ((bytesRead = is.read(buffer)) > 0) {
os.write(buffer, 0, bytesRead);
totalBytesCopied += bytesRead;
monitor.setProgress(totalBytesCopied);
monitor.checkCancelled();
CancelledListener l = () -> FSUtilities.uncheckedClose(is, null);
monitor.addCancelledListener(l);
try {
while ((bytesRead = is.read(buffer)) > 0) {
os.write(buffer, 0, bytesRead);
totalBytesCopied += bytesRead;
monitor.setProgress(totalBytesCopied);
monitor.checkCancelled();
}
os.flush();
return totalBytesCopied;
}
finally {
monitor.removeCancelledListener(l);
}
os.flush();
return totalBytesCopied;
}
/**