Apple-2gs-SW/GNO-Extras
1
0
Fork 0
mirror of https://github.com/bobbimanners/GNO-Extras.git synced 2024-06-13 12:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix to sortblocks() routine

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-02-06 11:07:39 -05:00
parent 14c8c83a88
commit ec0add343e
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bobbi/sortdir.c#b00008
View File

@ -70,7 +70,6 @@ struct pd_dirent {
uchar hdrptr[2]; uchar hdrptr[2];
}; };
#define BLKSZ 512 /* 512 byte blocks */ #define BLKSZ 512 /* 512 byte blocks */
#define PTRSZ 4 /* 4 bytes of pointers at beginning of each blk */ #define PTRSZ 4 /* 4 bytes of pointers at beginning of each blk */
@ -86,8 +85,6 @@ struct block {
struct block *next; struct block *next;
}; };
struct block *blocks = NULL;
/* /*
* Entry for array of filenames used by qsort() * Entry for array of filenames used by qsort()
*/ */
@ -98,6 +95,7 @@ struct fileent {
}; };
/* Globals */ /* Globals */
static struct block *blocks = NULL;
static struct fileent filelist[MAXFILES]; static struct fileent filelist[MAXFILES];
static uint numfiles = 0; static uint numfiles = 0;
static uchar entsz; /* Bytes per file entry */ static uchar entsz; /* Bytes per file entry */
@ -105,6 +103,7 @@ static uchar entperblk; /* Number of entries per block */
static char buf[BLKSZ]; /* General purpose scratch buffer */ static char buf[BLKSZ]; /* General purpose scratch buffer */
static uchar dowrite = 0; static uchar dowrite = 0;
static uchar doreverse = 0; static uchar doreverse = 0;
static uchar doverbose = 0;
static uint stack; // DEBUG static uint stack; // DEBUG
@ -131,6 +130,7 @@ int writedir(uchar device);
void freeblocks(void); void freeblocks(void);
void usage(void); void usage(void);
/* Print error string to stderr */
void prerr(char *s) { void prerr(char *s) {
fputs(s, stderr); fputs(s, stderr);
fputs("\n", stderr); fputs("\n", stderr);
@ -533,16 +533,18 @@ void printlist(void) {
*/ */
void copyent(uint srcblk, uint srcent, uint dstblk, uint dstent, uint device) { void copyent(uint srcblk, uint srcent, uint dstblk, uint dstent, uint device) {
fputs(" from blk ", stdout); if (doverbose) {
pr_uint(srcblk); fputs(" from blk ", stdout);
fputs(" entry ", stdout); pr_uint(srcblk);
pr_uint(srcent); fputs(" entry ", stdout);
putchar('\n'); pr_uint(srcent);
fputs(" to blk ", stdout); putchar('\n');
pr_uint(dstblk); fputs(" to blk ", stdout);
fputs(" entry ", stdout); pr_uint(dstblk);
pr_uint(dstent); fputs(" entry ", stdout);
putchar('\n'); pr_uint(dstent);
putchar('\n');
}
struct block *source = blocks; struct block *source = blocks;
struct block *dest = blocks; struct block *dest = blocks;
@ -571,7 +573,8 @@ void copyent(uint srcblk, uint srcent, uint dstblk, uint dstent, uint device) {
exit(1); exit(1);
} }
} else { } else {
puts("Not writing updated subdir to disk"); if (doverbose)
puts("Not writing updated subdir to disk");
} }
} }
} }
@ -587,8 +590,7 @@ void sortblocks(uint device) {
puts(filelist[i].name); puts(filelist[i].name);
copyent(filelist[i].blockidx, filelist[i].entrynum, copyent(filelist[i].blockidx, filelist[i].entrynum,
destblk, destentry, device); destblk, destentry, device);
++destentry; if (destentry++ == entperblk) {
if (destentry == entperblk) {
++destblk; ++destblk;
destentry = 1; destentry = 1;
} }
@ -623,9 +625,10 @@ void freeblocks(void) {
} }
void usage(void) { void usage(void) {
prerr("usage: sortdir [-w] [-r] path\n"); prerr("usage: sortdir [-rwv] path\n");
prerr(" Flags: -w Enable writing to disk"); prerr(" Options: -r Reverse sort order");
prerr(" -r Reverse sort order\n"); prerr(" -w Enable writing to disk");
prerr(" -v Verbose output\n");
exit(2); exit(2);
} }
@ -635,7 +638,7 @@ int main(int argc, char *argv[]) {
exit(1); exit(1);
} }
int opt; int opt;
while ((opt = getopt(argc, argv, "rw")) != -1) { while ((opt = getopt(argc, argv, "rwv")) != -1) {
switch (opt) { switch (opt) {
case 'r': case 'r':
doreverse = 1; doreverse = 1;
@ -643,6 +646,9 @@ int main(int argc, char *argv[]) {
case 'w': case 'w':
dowrite = 1; dowrite = 1;
break; break;
case 'v':
doverbose = 1;
break;
default: default:
usage(); usage();
} }
@ -658,13 +664,15 @@ int main(int argc, char *argv[]) {
} }
uchar err = readdir(dev, blk); uchar err = readdir(dev, blk);
if (!err) { if (!err) {
printlist(); if (doverbose)
printlist();
sortlist(); sortlist();
sortblocks(dev); sortblocks(dev);
if (dowrite) if (dowrite)
err = writedir(dev); err = writedir(dev);
else else
puts("Not writing to disk"); if (doverbose)
puts("Not writing to disk");
} }
freeblocks(); freeblocks();
return err; return err;