From 5f02faf303b906eb5d7262163c72414f1ff9cf59 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 29 Jul 2021 01:07:29 -0400
Subject: [PATCH] prodos: work on catalog

---
 utils/prodos-utils/prodos.c               |  2 +-
 utils/prodos-utils/prodos_catalog.c       | 38 +++++++++++++----------
 utils/prodos-utils/prodos_volume_bitmap.c |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/utils/prodos-utils/prodos.c b/utils/prodos-utils/prodos.c
index 06d0335b..391e9a20 100644
--- a/utils/prodos-utils/prodos.c
+++ b/utils/prodos-utils/prodos.c
@@ -1071,7 +1071,7 @@ int main(int argc, char **argv) {
 		break;
 
        case COMMAND_CATALOG:
-		prodos_read_voldir(dos_fd,&voldir,interleave);
+
 		prodos_catalog(dos_fd,&voldir);
 
 		break;
diff --git a/utils/prodos-utils/prodos_catalog.c b/utils/prodos-utils/prodos_catalog.c
index b34fc015..ff9402f2 100644
--- a/utils/prodos-utils/prodos_catalog.c
+++ b/utils/prodos-utils/prodos_catalog.c
@@ -75,7 +75,7 @@ static int prodos_get_catalog_ts(struct voldir_t *voldir) {
 
 	/* returns the next valid catalog entry */
 	/* 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 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) {
 
-	int catalog_entry;
+	int catalog_block,catalog_offset;
+	int blocks_free=0;
 
-#if 0
-	/* get first catalog */
-	catalog_entry=prodos_get_catalog_ts(voldir);
+	blocks_free=prodos_voldir_free_space(voldir);
 
-	printf("\nDISK VOLUME %i\n\n",voldir[VTOC_DISK_VOLUME]);
-	while(catalog_entry>0) {
-		catalog_entry=prodos_find_next_file(dos_fd,catalog_entry,voldir);
-		if (debug) fprintf(stderr,"CATALOG entry=$%X\n",catalog_entry);
-		if (catalog_entry>0) {
-			prodos_print_file_info(dos_fd,catalog_entry);
-			/* why 1<<16 ? */
-			catalog_entry+=(1<<16);
-			/* prodos_find_next_file() handles wrapping issues */
-		}
+	printf("\n");
+	printf("/%s\n\n",voldir->volume_name);
+
+	printf(" NAME           TYPE  BLOCKS  MODIFIED        CREATED          ENDFILE SUBTYPE\n");
+	printf("\n");
+
+	catalog_block=PRODOS_VOLDIR_KEY_BLOCK;
+	catalog_offset=1;	/* skip the header */
+
+	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");
 }
diff --git a/utils/prodos-utils/prodos_volume_bitmap.c b/utils/prodos-utils/prodos_volume_bitmap.c
index e96ca836..dfa70443 100644
--- a/utils/prodos-utils/prodos_volume_bitmap.c
+++ b/utils/prodos-utils/prodos_volume_bitmap.c
@@ -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 */