Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-12-27 17:29:49 +00:00
Code Issues Projects Releases Wiki Activity

prodos: work on catalog

Browse Source
This commit is contained in:
Vince Weaver 2021-07-29 01:07:29 -04:00
parent d8be8dc59e
commit 5f02faf303
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/prodos-utils/prodos.c
View File

@ -1071,7 +1071,7 @@ int main(int argc, char **argv) {
break; break;
case COMMAND_CATALOG: case COMMAND_CATALOG:
prodos_read_voldir(dos_fd,&voldir,interleave);
prodos_catalog(dos_fd,&voldir); prodos_catalog(dos_fd,&voldir);
break; break;

38
utils/prodos-utils/prodos_catalog.c
View File

@ -75,7 +75,7 @@ static int prodos_get_catalog_ts(struct voldir_t *voldir) {
/* returns the next valid catalog entry */ /* returns the next valid catalog entry */
/* after the one passed in */ /* after the one passed in */
static int prodos_find_next_file(int fd,int catalog_tsf,unsigned char *voldir) { static int prodos_find_next_file(int catalog_tsf,struct voldir_t *voldir) {
int catalog_track,catalog_sector,catalog_file; int catalog_track,catalog_sector,catalog_file;
int file_track,i; int file_track,i;
@ -194,23 +194,29 @@ static int prodos_print_file_info(int fd,int catalog_tsf) {
void prodos_catalog(int dos_fd, struct voldir_t *voldir) { void prodos_catalog(int dos_fd, struct voldir_t *voldir) {
int catalog_entry; int catalog_block,catalog_offset;
int blocks_free=0;
#if 0 blocks_free=prodos_voldir_free_space(voldir);
/* get first catalog */
catalog_entry=prodos_get_catalog_ts(voldir);
printf("\nDISK VOLUME %i\n\n",voldir[VTOC_DISK_VOLUME]); printf("\n");
while(catalog_entry>0) { printf("/%s\n\n",voldir->volume_name);
catalog_entry=prodos_find_next_file(dos_fd,catalog_entry,voldir);
if (debug) fprintf(stderr,"CATALOG entry=$%X\n",catalog_entry); printf(" NAME TYPE BLOCKS MODIFIED CREATED ENDFILE SUBTYPE\n");
if (catalog_entry>0) { printf("\n");
prodos_print_file_info(dos_fd,catalog_entry);
/* why 1<<16 ? */ catalog_block=PRODOS_VOLDIR_KEY_BLOCK;
catalog_entry+=(1<<16); catalog_offset=1; /* skip the header */
/* prodos_find_next_file() handles wrapping issues */
} while(1) {
catalog_offset=prodos_find_next_file(catalog_offset,voldir);
if (catalog_offset<0) break;
} }
#endif
printf("\n");
printf("BLOCKS FREE: % 3d ",blocks_free);
printf(" BLOCKS USED: % 3d ",voldir->total_blocks-blocks_free);
printf(" TOTAL BLOCKS: % 3d ",voldir->total_blocks);
printf("\n"); printf("\n");
} }

2
utils/prodos-utils/prodos_volume_bitmap.c
View File

@ -55,7 +55,7 @@ int prodos_voldir_free_space(struct voldir_t *voldir) {
} }
} }
return blocks_free*PRODOS_BYTES_PER_BLOCK; return blocks_free;
} }
/* free a sector from the sector bitmap */ /* free a sector from the sector bitmap */