diff --git a/utils/dos33fs-utils/Makefile b/utils/dos33fs-utils/Makefile index 3a80563c..42b70d05 100644 --- a/utils/dos33fs-utils/Makefile +++ b/utils/dos33fs-utils/Makefile @@ -66,7 +66,7 @@ dos33_vtoc_bitmap.o: dos33_vtoc_bitmap.c dos33.h ### dos33_catalog.o: dos33_catalog.c dos33.h - $(CC) $(CFLAGS) -c dos33_catalog.c + $(CC) $(CFLAGS) -g -c dos33_catalog.c ### diff --git a/utils/dos33fs-utils/dos33.c b/utils/dos33fs-utils/dos33.c index 65d9802f..d97797d7 100644 --- a/utils/dos33fs-utils/dos33.c +++ b/utils/dos33fs-utils/dos33.c @@ -11,7 +11,9 @@ #include "dos33.h" -static int debug=0,ignore_errors=0; +int debug=1; + +static int ignore_errors=0; static unsigned char get_high_byte(int value) { return (value>>8)&0xff; @@ -684,6 +686,11 @@ static int dos33_delete_file(unsigned char *vtoc,int fd,int fsl) { catalog_track=(fsl>>8)&0xff; catalog_sector=(fsl&0xff); + if (debug) { + fprintf(stderr,"DELETE: deleting file T=%d S=%d E=%d\n", + catalog_track,catalog_sector,catalog_entry); + } + /* Load in the catalog table for the file */ lseek(fd,DISK_OFFSET(catalog_track,catalog_sector),SEEK_SET); result=read(fd,catalog_buffer,BYTES_PER_SECTOR); @@ -705,9 +712,17 @@ static int dos33_delete_file(unsigned char *vtoc,int fd,int fsl) { keep_deleting: + if (debug) { + fprintf(stderr,"\tLoading T/S list T=%d S=%d\n", + ts_track,ts_sector); + } + /* load in the t/s list info */ lseek(fd,DISK_OFFSET(ts_track,ts_sector),SEEK_SET); result=read(fd,catalog_buffer,BYTES_PER_SECTOR); + if (result<0) { + fprintf(stderr,"delete: error reading catalog\n"); + } /* Free each sector listed by t/s list */ for(i=0;i