EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disk/format: choose default cluster size if not given

front
cinap_lenrek 2012-05-06 13:51:53 +02:00
parent 68c77bf4a6
commit 7fff1f8dba
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/src/cmd/disk/format.c
View File

@ -364,6 +364,23 @@ writen(int fd, void *buf, long n)
return tot; return tot;
} }
int
defcluster(vlong n)
{
int i;
i = n / 32768;
if(i <= 1)
return 1;
if(i >= 128)
return 128;
i--;
i |= i >> 1;
i |= i >> 2;
i |= i >> 4;
return i+1;
}
void void
dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int commit) dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int commit)
{ {
@ -388,6 +405,7 @@ dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int
t->sectors = disk->s; t->sectors = disk->s;
t->heads = disk->h; t->heads = disk->h;
t->tracks = disk->c; t->tracks = disk->c;
t->cluster = defcluster(disk->secs);
} }
if(t->sectors == 0 && dofat) if(t->sectors == 0 && dofat)
@ -490,6 +508,8 @@ dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int
if(clustersize == 0) if(clustersize == 0)
clustersize = t->cluster; clustersize = t->cluster;
if(chatty) print("clustersize %d\n", clustersize);
/* /*
* the number of fat bits depends on how much disk is left * the number of fat bits depends on how much disk is left
* over after you subtract out the space taken up by the fat tables. * over after you subtract out the space taken up by the fat tables.
@ -519,7 +539,8 @@ Tryagain:
break; break;
clusters = newclusters; clusters = newclusters;
if(i > 10) if(i > 10)
fatal("can't decide how many clusters to use (%d? %d?)", clusters, newclusters); fatal("can't decide how many clusters to use (%d? %d?)",
clusters, newclusters);
if(chatty) print("clusters %d\n", clusters); if(chatty) print("clusters %d\n", clusters);
} }
@ -786,7 +807,7 @@ addrname(uchar *entry, Dir *dir, char *name, ulong start)
d = (Dosdir*)entry; d = (Dosdir*)entry;
putname(s, d); putname(s, d);
if(strcmp(s, "9load") == 0) if(cistrcmp(s, "9load") == 0 || cistrncmp(s, "9boot", 5) == 0)
d->attr = DSYSTEM; d->attr = DSYSTEM;
else else
d->attr = 0; d->attr = 0;