From 4d8aa68495cbc892a2652c1d0f2c89e0f1705199 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Sun, 31 May 2020 19:25:14 -0400 Subject: [PATCH] Made code work properly when CHECK is disabled (#undef CHECK). --- sortdir.c | 20 +++++++++++++++----- sortdir.po | Bin 143360 -> 143360 bytes 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sortdir.c b/sortdir.c index 4b8a41f..89ead86 100644 --- a/sortdir.c +++ b/sortdir.c @@ -26,6 +26,7 @@ * v0.60 Modified fileent to be a union. Build it for each subsort. Saves RAM. * v0.61 Squeezed fileent to be a few bytes smaller. Fixed folder sort. * v0.62 Modified buildsorttable() to update existing filelist[]. + * v0.63 Made code work properly with #undef CHECK. */ //#pragma debug 9 @@ -203,12 +204,12 @@ static char sortopts[NLEVELS+1] = ""; /* -s:abc list of sort options */ static char caseopts[2] = ""; /* -c:x case conversion option */ static char fixopts[2] = ""; /* -f:x fix mode option */ static char dateopts[2] = ""; /* -d:x date conversion option */ -static struct fileent *filelist; /* Used for qsort() */ // Allocated dynamically in main() static char *buf; /* General purpose scratch buffer */ static char *buf2; /* General purpose scratch buffer */ static char *dirblkbuf; /* Used for reading directory blocks */ +static struct fileent *filelist; /* Used for qsort() */ /* Prototypes */ #ifdef AUXMEM @@ -239,12 +240,14 @@ int isused(uint blk); void markused(uint blk); void checkblock(uint blk, char *msg); #endif +#ifdef CHECK int seedlingblocks(uchar device, uint keyblk, uint *blkcnt); int saplingblocks(uchar device, uint keyblk, uint *blkcnt); int treeblocks(uchar device, uint keyblk, uint *blkcnt); int forkblocks(uchar device, uint keyblk, uint *blkcnt); int subdirblocks(uchar device, uint keyblk, struct pd_dirent *ent, uint blocknum, uint blkentries, uint *blkcnt); +#endif void enqueuesubdir(uint blocknum, uint subdiridx); int readdir(uint device, uint blocknum); #ifdef SORT @@ -433,7 +436,7 @@ int writediskblock(uchar device, uint blocknum, char *buf) { int rc; if ((strcmp(currdir, "LIB") == 0) || (strcmp(currdir, "LIBRARIES") == 0)) { - printf("Not writing library directory %s\n", currdir); + printf("Not writing lib dir %s\n", currdir); return 0; } flushall(); @@ -813,6 +816,8 @@ void checkblock(uint blk, char *msg) { #endif +#ifdef CHECK + /* * Count the blocks in a seedling file */ @@ -1033,6 +1038,8 @@ int subdirblocks(uchar device, uint keyblk, struct pd_dirent *ent, return 0; } +#endif + /* * Record the keyblock of a subdirectory to be processed subsequently * blocknum is the block number of the subdirectory keyblock @@ -1182,7 +1189,6 @@ int readdir(uint device, uint blocknum) { fixcase(ent->name, namebuf, ent->vers, ent->minvers, ent->typ_len & 0x0f); -#ifdef CHECK switch (ent->typ_len & 0xf0) { case 0x10: fputs("Seed ", stdout); @@ -1207,7 +1213,7 @@ int readdir(uint device, uint blocknum) { break; } fputs(namebuf, stdout); -#endif + blks = ent->blksused[0] + 256U * ent->blksused[1]; eof = ent->eof[0] + 256L * ent->eof[1] + 65536L * ent->eof[2]; @@ -1283,7 +1289,11 @@ int readdir(uint device, uint blocknum) { if (errcount == errsbeforeent) { for (i = 0; i < 53 - strlen(namebuf); ++i) putchar(' '); +#ifdef CHECK printf("%5u blocks [ OK ]", blks); +#else + printf("%5u blocks\n", blks); +#endif } else putchar('\n'); ++entries; @@ -1835,7 +1845,7 @@ void interactive(void) { doverbose = 1; - puts("S O R T D I R v0.62 alpha Use ^ to return to previous question"); + puts("S O R T D I R v0.63 alpha Use ^ to return to previous question"); q1: fputs("\nEnter path (e.g.: /H1) of starting directory> ", stdout); diff --git a/sortdir.po b/sortdir.po index 1146da4b7d46262959552f584029dd7f768965b0..7d5849359ecc3978f36e68a32a54a62603b0f887 100644 GIT binary patch delta 8010 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 delta 7978 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 OJd=d7FB-lOe*SL~^J+W*