register unsigned char* b;
register unsigned char i;
register unsigned char count;
- unsigned char s;
- unsigned char j;
+ static unsigned char s;
+ static unsigned char j;
unsigned char buffer[0x40];
static struct dirent entry;
goto exitpoint;
}
- /* Adjust the directory offset */
- dir->off += 4;
-
/* Read the next file entry into the buffer */
for (count = 0, b = buffer; count < sizeof (buffer); ++b) {
if (!_dirread1 (dir, b)) {
}
}
- /* Bump the directory offset */
- dir->off += count;
+ /* Bump the directory offset and include the bytes for line-link and size */
+ dir->off += count + 4;
/* End of directory is reached if the buffer contains "blocks free". It is
* sufficient here to check for the leading 'b'. buffer will contain at
case 1:
/* Within file name */
if (*b == '"') {
+ /* End of file name found. */
entry.d_name[j] = '\0';
entry.d_namlen = j;
- s = 2;
+ if (entry.d_off > 2) {
+ /* Proceed with file type */
+ s = 2;
+ } else {
+ /* This is a disk header, so we're done */
+ entry.d_type = _CBM_T_HEADER;
+ return &entry;
+ }
} else if (j < sizeof (entry.d_name) - 1) {
entry.d_name[j] = *b;
++j;
/* Distinguish DEL or DIR file type entries */
switch (*b) {
case 'e': break;
- case 'i': entry.d_type = CBM_T_DIR; break;
- default: entry.d_type = CBM_T_OTHER; break;
+ case 'i': entry.d_type = _CBM_T_DIR; break;
+ default: entry.d_type = _CBM_T_OTHER; break;
}
return &entry;
}