Apple-2-Tools/jace
1
0
Fork 1
mirror of https://github.com/badvision/jace.git synced 2024-06-17 06:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixed gremlin in directory node handling -- now there are no missing entries and no garbage files listed in Copy ][+

Browse Source
This commit is contained in:
Brendan Robert 2015-12-28 21:28:11 -06:00
parent 8bcf3a922a
commit 5f9352abb3
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/jace/hardware/massStorage/DirectoryNode.java
View File

@ -21,6 +21,7 @@ package jace.hardware.massStorage;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@ -121,6 +122,7 @@ public class DirectoryNode extends DiskNode implements FileFilter {
@Override @Override
public void readBlock(int block, byte[] buffer) throws IOException { public void readBlock(int block, byte[] buffer) throws IOException {
Arrays.fill(buffer, (byte) 0);
checkFile(); checkFile();
if (block == 0) { if (block == 0) {
generateHeader(buffer); generateHeader(buffer);
@ -128,7 +130,7 @@ public class DirectoryNode extends DiskNode implements FileFilter {
generateFileEntry(buffer, 4 + (i + 1) * FILE_ENTRY_SIZE, i); generateFileEntry(buffer, 4 + (i + 1) * FILE_ENTRY_SIZE, i);
} }
} else { } else {
generatePointers(buffer, additionalNodes.get(block-1).getBaseBlock(), block < (additionalNodes.size()-1) ? additionalNodes.get(block+1).getBaseBlock() : 0); generatePointers(buffer, getNodeSequence(block-1).getBaseBlock(), getNodeSequence(block+1) != null ? getNodeSequence(block+1).getBaseBlock() : 0);
int start = (block * 13) - 1; int start = (block * 13) - 1;
int end = start + 13; int end = start + 13;
int offset = 4; int offset = 4;
@ -167,7 +169,7 @@ public class DirectoryNode extends DiskNode implements FileFilter {
*/ */
@SuppressWarnings("static-access") @SuppressWarnings("static-access")
private void generateHeader(byte[] buffer) { private void generateHeader(byte[] buffer) {
generatePointers(buffer, 0, additionalNodes.size()>1 ? additionalNodes.get(1).getBaseBlock() : 0); generatePointers(buffer, 0, getNodeSequence(1) == null ? 0 : getNodeSequence(1).getBaseBlock());
// Directory header + name length // Directory header + name length
// Volumme header = 0x0f0; Subdirectory header = 0x0e0 // Volumme header = 0x0f0; Subdirectory header = 0x0e0
buffer[4] = (byte) ((isRoot ? 0x0F0 : 0x0E0) | getName().length()); buffer[4] = (byte) ((isRoot ? 0x0F0 : 0x0E0) | getName().length());

10
src/main/java/jace/hardware/massStorage/DiskNode.java
View File

@ -115,6 +115,16 @@ public abstract class DiskNode {
allocate(); allocate();
} }
public DiskNode getNodeSequence(int num) {
if (num == 0) {
return this;
} else if (num <= additionalNodes.size()) {
return additionalNodes.get(num-1);
} else {
return null;
}
}
/** /**
* @return the allocated * @return the allocated
*/ */

2
src/main/java/jace/hardware/massStorage/FileNode.java
View File

@ -194,7 +194,7 @@ public class FileNode extends DiskNode {
private void generateIndex(byte[] buffer, int indexStart, int indexLimit) { private void generateIndex(byte[] buffer, int indexStart, int indexLimit) {
Arrays.fill(buffer, (byte) 0); Arrays.fill(buffer, (byte) 0);
for (int i = indexStart, count = 0; count < 256 && i < indexLimit && i <= additionalNodes.size(); i++, count++) { for (int i = indexStart, count = 0; count < 256 && i < indexLimit && i <= additionalNodes.size(); i++, count++) {
int base = additionalNodes.get(i-1).getBaseBlock(); int base = getNodeSequence(i).getBaseBlock();
buffer[count] = (byte) (base & 0x0ff); buffer[count] = (byte) (base & 0x0ff);
buffer[count + 256] = (byte) (base >> 8); buffer[count + 256] = (byte) (base >> 8);
} }