Skip to content

Commit

Permalink
Remove debug output
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwildie
dwildie committed Jan 10, 2023
1 parent 818842c commit 197059c
Showing 1 changed file with 11 additions and 19 deletions.
30 changes: 11 additions & 19 deletions src/main/java/au/wildie/m68k/cromixfs/fs/cromix/CromixFileSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public String getName() {

@Override
public void list(PrintStream out) throws IOException {
out.printf("Version: %s\n", getVersion());
out.printf("File system version: %s\n", getVersion());
readDirectory("", inodeManager.getInode( 1), LIST, null, out);
}

Expand Down Expand Up @@ -471,7 +471,7 @@ private void readDirectory(String srcPath, Inode inode, DumpMode mode, String tr
}
}
if (entryInode.getType() == FILE && mode == EXTRACT) {
extractFile(entryInode, entryInode.getFileSize(), entryInode.getModified(), trgPath + FILE_SEP + entry.getName(), listingOut);
extractFile(entryInode, entryInode.getFileSize(), entryInode.getModified(), trgPath + FILE_SEP + entry.getName());
}
}
}
Expand All @@ -480,7 +480,7 @@ private void readDirectory(String srcPath, Inode inode, DumpMode mode, String tr
listingOut.print("");
}

private void extractFile(Inode inode, int size, CromixTime modified, String path, PrintStream listingOut) throws IOException {
private void extractFile(Inode inode, int size, CromixTime modified, String path) throws IOException {
int remainingBytes = size;
File file = new File(path);

Expand All @@ -489,7 +489,6 @@ private void extractFile(Inode inode, int size, CromixTime modified, String path
for (int i = 0; i < 0x10 && remainingBytes > 0; i++) {
int blockNumber = inode.getBlockNumber(i);
if (blockNumber != 0) {
listingOut.format(" 0x%06x", blockNumber);
byte[] data = getBlock(blockNumber);
int bytes = Math.min(remainingBytes, data.length);
fileOutputStream.write(data, 0, bytes);
Expand All @@ -505,7 +504,7 @@ private void extractFile(Inode inode, int size, CromixTime modified, String path
// 17th pointer
int blockNumber = inode.getBlockNumber(INDIRECT_1_BLOCK);
if (blockNumber != 0) {
remainingBytes = extractPointerBlock(blockNumber, fileOutputStream, remainingBytes, listingOut);
remainingBytes = extractPointerBlock(blockNumber, fileOutputStream, remainingBytes);
}

if (remainingBytes == 0) {
Expand All @@ -516,7 +515,7 @@ private void extractFile(Inode inode, int size, CromixTime modified, String path
// 18th pointer
blockNumber = inode.getBlockNumber(INDIRECT_2_BLOCK);
if (blockNumber != 0) {
remainingBytes = extractPointerPointerBlock(blockNumber, fileOutputStream, remainingBytes, listingOut);
remainingBytes = extractPointerPointerBlock(blockNumber, fileOutputStream, remainingBytes);
}

if (remainingBytes == 0) {
Expand All @@ -527,7 +526,7 @@ private void extractFile(Inode inode, int size, CromixTime modified, String path
// 19th pointer
blockNumber = inode.getBlockNumber(INDIRECT_3_BLOCK);
if (blockNumber != 0) {
remainingBytes = extractPointerPointerPointerBlock(blockNumber, fileOutputStream, remainingBytes, listingOut);
remainingBytes = extractPointerPointerPointerBlock(blockNumber, fileOutputStream, remainingBytes);
}

if (remainingBytes != 0) {
Expand All @@ -539,7 +538,6 @@ private void extractFile(Inode inode, int size, CromixTime modified, String path
} catch (ImageException e) {
System.out.printf("Error extracting file %s, only %d bytes of %d bytes extracted. %s\n", path, size - remainingBytes, size, e.getMessage());
} finally {
listingOut.print("\n");
try {
if (modified.toDate().before(new Date())) {
try {
Expand All @@ -566,38 +564,32 @@ protected byte[] getBlock(int blockNumber) {
}
}

private int extractPointerPointerPointerBlock(int ptrPtrPtrBlockNumber, OutputStream out, int remainingBytes, PrintStream listingOut) throws IOException {
listingOut.format(" 0x%06x", ptrPtrPtrBlockNumber);
private int extractPointerPointerPointerBlock(int ptrPtrPtrBlockNumber, OutputStream out, int remainingBytes) throws IOException {
byte[] block = getBlock(ptrPtrPtrBlockNumber);
for (int i = 0; i < BLOCK_POINTER_COUNT && remainingBytes > 0; i++) {
int ptrPtrBlockNumber = readDWord(block, i * 4);
if (ptrPtrBlockNumber != 0) {
remainingBytes = extractPointerPointerBlock(ptrPtrBlockNumber, out, remainingBytes, listingOut);
remainingBytes = extractPointerPointerBlock(ptrPtrBlockNumber, out, remainingBytes);
}
}
return remainingBytes;
}

private int extractPointerPointerBlock(int ptrPtrBlockNumber, OutputStream out, int remainingBytes, PrintStream listingOut) throws IOException {
listingOut.format(" 0x%06x", ptrPtrBlockNumber);
private int extractPointerPointerBlock(int ptrPtrBlockNumber, OutputStream out, int remainingBytes) throws IOException {
byte[] block = getBlock(ptrPtrBlockNumber);
for (int i = 0; i < BLOCK_POINTER_COUNT && remainingBytes > 0; i++) {
int ptrBlockNumber = readDWord(block, i * 4);
if (ptrBlockNumber != 0) {
remainingBytes = extractPointerBlock(ptrBlockNumber, out, remainingBytes, listingOut);
remainingBytes = extractPointerBlock(ptrBlockNumber, out, remainingBytes);
}
}
return remainingBytes;
}

private int extractPointerBlock(int ptrBlockNumber, OutputStream out, int remainingBytes, PrintStream listingOut) throws IOException {
listingOut.format(" 0x%06x", ptrBlockNumber);
private int extractPointerBlock(int ptrBlockNumber, OutputStream out, int remainingBytes) throws IOException {
byte[] block = getBlock(ptrBlockNumber);
for (int i = 0; i < BLOCK_POINTER_COUNT && remainingBytes > 0; i++) {
int blockNumber = readDWord(block, i * 4);
if (blockNumber != 0) {
listingOut.format(" 0x%06x", blockNumber);
}
byte[] data = blockNumber == 0 ? new byte[512] : getBlock(blockNumber);
int bytes = Math.min(remainingBytes, data.length);
out.write(data, 0, bytes);
Expand Down

0 comments on commit 197059c

Please sign in to comment.