TempleOSCDV4.02.ISO

Adam/ABlkDev/ADskA.CPP

@@ -58,39 +58,6 @@ public U8 *Dump(U8 *filename,Bool write=FALSE)
   return buf;
 }
 
-#help_index "File/Program Routines"
-
-U0 FOFlatten(CDirEntry *tempde,CDirEntry **a,I64 *i)
-{
-  CDirEntry *tempde1;
-  while (tempde) {
-    tempde1=tempde->next;
-    if (tempde->attr&RS_ATTR_DIR) {
-      FOFlatten(tempde->sub,a,i);
-      DirEntryDel(tempde);
-    } else {
-      a[*i]=tempde;
-      *i=*i+1;
-    }
-    tempde=tempde1;
-  }
-}
-
-public I64 FileCnt(CDirEntry *tempde)
-{//Cnt of files in $LK,"CDirEntry",A="MN:CDirEntry"$ tree.
-  I64 cnt=0;
-  while (tempde) {
-    if (tempde->attr&RS_ATTR_DIR)
-      cnt+=FileCnt(tempde->sub);
-    else
-      cnt++;
-    tempde=tempde->next;
-  }
-  return cnt;
-}
-
-#help_index "File/Cmd Line (Typically);Cmd Line (Typically)"
-
 public Bool Copy(U8 *src_files_find_mask,U8 *dst_files_find_mask=".")
 {//Copy files.
 //If the name ends in ".Z", it will
@@ -281,128 +248,3 @@ Touch(filename,"",,datetime);
   }
   DirTreeDel(tempde1);
 }
-
-public I64 FF(U8 *files_find_mask,U8 *fu_flags=NULL)
-{//Files find. List files matching mask.
-  I64 cnt=0,fuf_flags=0;
-  CDirEntry *tempde,*tempde1;
-  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+f+F");
-  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
-  tempde=tempde1=FilesFind(files_find_mask,fuf_flags);
-  while (tempde) {
-    PutFileLink(tempde->full_name);
-    '\n';
-    cnt++;
-    tempde=tempde->next;
-  }
-  DirTreeDel(tempde1);
-  return cnt;
-}
-
-public U0 DrvTextAttrSet(U8 drv_let,U8 attr)
-{//Set color of the window border text
-//for when this drive is the current drive.
-  CDrv *dv;
-  try {
-    dv=Let2Drv(drv_let);
-    dv->text_attr=attr;
-  } catch
-    Fs->catch_except=TRUE;
-}
-I64 RedSeaUnusedDrvSpace(U8 drv_let=0)
-{
-  CDrv *dv=Let2Drv(drv_let);
-  I64 result=0,i,l;
-  U8 *bitmap;
-  try {
-    l=(dv->size+dv->spc-1)/dv->spc;
-    i=((l+7)>>3+BLK_SIZE-1)>>BLK_SIZE_BITS;
-    bitmap=MAlloc(i<<BLK_SIZE_BITS);
-    RBlks(dv,bitmap,dv->fat1,i);
-    for (i=0;i<l;i++)
-      if (!Bt(bitmap,i))
-	result++;
-    Free(bitmap);
-  } catch
-    DrvUnlock(dv);
-  return result*BLK_SIZE*dv->spc;
-}
-I64 FAT32UnusedDrvSpace(U8 drv_let=0)
-{
-  CDrv *dv=Let2Drv(drv_let);
-  I64 result=0,i,l;
-  U32 *bitmap;
-  try {
-    l=(dv->size+dv->spc-1)/dv->spc;
-    i=(l*4+BLK_SIZE-1)>>BLK_SIZE_BITS;
-    bitmap=MAlloc(i<<BLK_SIZE_BITS);
-    RBlks(dv,bitmap,dv->fat1,i);
-    for (i=0;i<l;i++)
-      if (!bitmap[i])
-	result++;
-    Free(bitmap);
-  } catch
-    DrvUnlock(dv);
-  return result*BLK_SIZE*dv->spc;
-}
-public I64 UnusedDrvSpace(U8 drv_let=0)
-{//Returns unused size in bytes.
-  CDrv *dv=Let2Drv(drv_let),*old_dv=Fs->cur_dv;
-  U8 *old_dir=StrNew(Fs->cur_dir);
-  I64 result=0;
-  Drv(drv_let);
-  switch (dv->type) {
-    case DVT_REDSEA:
-      result=RedSeaUnusedDrvSpace(drv_let);
-      break;
-    case DVT_FAT32:
-      result=FAT32UnusedDrvSpace(drv_let);
-      break;
-    default:
-      PrintErr("File System Not Supported\n");
-  }
-  Drv(Drv2Let(old_dv));
-  Cd(old_dir);
-  Free(old_dir);
-  return result;
-}
-
-#help_index "File/Program Routines"
-I64 Size1(CDirEntry *tempde,I64 *_fuf_flags,I64 round_to)
-{
-  U8 buf[BLK_SIZE];
-  I64 result=0,i;
-  CDrv *dv;
-  while (tempde) {
-    if ((i=tempde->size) && Bt(_fuf_flags,FUf_EXPAND) &&
-	  !(tempde->attr&RS_ATTR_DIR) &&
-	  FileAttr(tempde->name)&RS_ATTR_COMPRESSED) {
-      dv=Let2Drv(*tempde->full_name);
-      RBlks(dv,buf,Cluster2Blk(dv,tempde->cluster),1);
-      i=(&buf)(CArcCompress *)->expanded_size;
-    }
-    if (round_to)
-      i=CeilU64(tempde->size,round_to);
-    if (tempde->attr&RS_ATTR_DIR)
-      i+=Size1(tempde->sub,_fuf_flags,round_to);
-    tempde->user_data=i;
-    result+=i;
-    tempde=tempde->next;
-  }
-  return result;
-}
-public I64 Size(U8 *files_find_mask="/*",U8 *fu_flags=NULL,I64 round_to=0)
-{//Total size of files in mask. "+x" for expanded size.
-//Does not include directory size of base directory, but
-  //does include size of sub directories.
-  I64 fuf_flags=0,result=0;
-  CDirEntry *tempde1=NULL;
-  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r");
-  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
-  if (tempde1=FilesFind(files_find_mask,fuf_flags&FUG_FILES_FIND)) {
-    fuf_flags&=FUF_EXPAND;
-    result=Size1(tempde1,&fuf_flags,round_to);
-    DirTreeDel(tempde1);
-  }
-  return result;
-}

Adam/ABlkDev/ADskB.CPP

@@ -60,336 +60,92 @@ public CDirEntry *DirTreeUnserialize(U8 *src)
   return tempde;
 }
 
-#help_index "Install;File/Cmd Line (Typically);Cmd Line (Typically)"
-
-#define ROUND_DRV_TO	(63*255)
-#define DRV_HEADER	63
-
-class CPlannedDrv
+#help_index "File/Program Routines"
+U0 FOFlatten(CDirEntry *tempde,CDirEntry **a,I64 *i)
 {
-  CPlannedDrv *next,*last;
-  I64 size;
-  Bool pri;
-};
-
-//Available to assist in writing scripts.
-I64 drv_dsk_dsk_size;
-
-public U0 PrtDsk(U8 drv_let=0)
-{//Partition the disk containing partition drv_let.
-//drv_let=0 means add new drive that
-  //is not already mounted.
-  CBlkDev *bd;
-  CPlannedDrv root,*temppp;
-  CMasterBoot mbr;
-  Bool pri=TRUE;
-  I64 ext_base,drv_let2,pri_cnt=0,
-	i,start_offset,offset,remaining;
-  "This command does not play well\n"
-	"with other operating systems.\n"
-	"You really should use another\n"
-	"operating system's partitioner.\n"
-	"If you use this, it may, in fact,\n"
-	"make your hard drive impossible\n"
-	"to repartition with other operating\n"
-	"until you set block zero to zero\n"
-	"with $$LK,\"MasterBootZero\",\"MN:MasterBootZero\"$$()\n\n\n"
-	"Continue";
-  if (!YorN) return;
-
-  if (drv_let)
-    try
-	    Let2BlkDev(drv_let);
-    catch {
-      drv_let=0;
-      Fs->catch_except=TRUE;
+  CDirEntry *tempde1;
+  while (tempde) {
+    tempde1=tempde->next;
+    if (tempde->attr&RS_ATTR_DIR) {
+      FOFlatten(tempde->sub,a,i);
+      DirEntryDel(tempde);
+    } else {
+      a[*i]=tempde;
+      *i=*i+1;
     }
-
-  if (!drv_let) {
-    Mount(TRUE);
-    return;
-  }
-
-  bd=Let2BlkDev(drv_let);
-  if (!bd || bd->type!=BDT_ATA)
-    return;
-
-  drv_dsk_dsk_size=bd->max_blk+1;
-
-  QueInit(&root);
-
-  drv_let2=bd->first_drv_let;
-  remaining=FloorU64(bd->max_blk+1,ROUND_DRV_TO);
-  while (FloorU64(remaining,ROUND_DRV_TO)>=ROUND_DRV_TO) {
-    temppp=MAlloc(sizeof(CPlannedDrv));
-    do {
-      "$$RED$$Partition %C$$FG$$\n",drv_let2;
-      temppp->pri=FALSE;
-      if (pri) {
-	"Primary Partition";
-	if (YorN) {
-	  pri_cnt++;
-	  temppp->pri=TRUE;
-	  if (pri_cnt==3)
-	    pri=FALSE;
-	} else
-	  pri=FALSE;
-      }
-      "Blocks Remaining:%d (0x%X)\n",
-	    remaining-DRV_HEADER,remaining-DRV_HEADER;
-      temppp->size=CeilU64(GetI64("Size in Blocks  :",
-	    remaining-DRV_HEADER)+DRV_HEADER,ROUND_DRV_TO);
-    } while (!(ROUND_DRV_TO<=temppp->size<=FloorU64(remaining,ROUND_DRV_TO)));
-    QueIns(temppp,root.last);
-    remaining-=temppp->size;
-    drv_let2++;
-  }
-
-  "\n\n!!! Repartition Drive !!!\n\n";
-  temppp=root.next;
-  drv_let2=bd->first_drv_let;
-  while (temppp!=&root) {
-    "Drive %C:%08X ",drv_let2,temppp->size;
-    if (temppp->pri)
-      "Primary\n";
-    else
-      "Logical\n";
-    temppp=temppp->next;
-    drv_let2++;
-  }
-  if (!AreYouSure)
-    goto pd_done;
-
-  remaining=FloorU64(bd->max_blk+1,ROUND_DRV_TO)-ROUND_DRV_TO;
-  temppp=root.next;
-  MemSet(&mbr,0,BLK_SIZE);
-  mbr.signature=0xAA55;
-  offset=0;
-  for (i=0;i<pri_cnt;i++) {
-    mbr.p[i].active=0x80;
-    mbr.p[i].start_head=0;
-    mbr.p[i].start_cyl=0x101;
-    mbr.p[i].type=1; //Will get set different.
-    mbr.p[i].end_head=0xFE;
-    mbr.p[i].end_cyl=0xFFFF;
-    mbr.p[i].offset=DRV_HEADER+offset;
-    mbr.p[i].size=temppp->size-DRV_HEADER;
-    offset+=temppp->size;
-    remaining-=temppp->size;
-    temppp=temppp->next;
-  }
-  if (!i) i++;
-  if (temppp!=&root) {
-    mbr.p[i].active=0x80;
-    mbr.p[i].start_head=0;
-    mbr.p[i].start_cyl=0x101;
-    mbr.p[i].type=0xF;
-    mbr.p[i].end_head=0xFE;
-    mbr.p[i].end_cyl=0xFFFF;
-    mbr.p[i].offset=offset;
-    mbr.p[i].size=remaining;
-    ext_base=offset;
-  }
-  ATAWriteBlks(bd,&mbr,0,1);
-
-  while (temppp!=&root) {
-    start_offset=offset;
-    MemSet(&mbr,0,BLK_SIZE);
-    mbr.signature=0xAA55;
-
-    mbr.p[0].active=0x80;
-    mbr.p[0].start_head=1;
-    mbr.p[0].start_cyl=0x101;
-    mbr.p[0].type=1; //Will get set different.
-    mbr.p[0].end_head=0xFE;
-    mbr.p[0].end_cyl=0xFFFF;
-    mbr.p[0].offset=DRV_HEADER;
-    mbr.p[0].size=temppp->size-DRV_HEADER;
-    offset+=temppp->size;
-    temppp=temppp->next;
-    if (temppp!=&root) {
-      mbr.p[1].active=0x80;
-      mbr.p[1].start_head=0;
-      mbr.p[1].start_cyl=0x101;
-      mbr.p[1].type=5;
-      mbr.p[1].end_head=0xFE;
-      mbr.p[1].end_cyl=0xFFFF;
-      mbr.p[1].offset=offset-ext_base;
-      mbr.p[1].size=temppp->size;
-    }
-    ATAWriteBlks(bd,&mbr,start_offset,1);
-  }
-
-  bd->flags&=~(BDF_INITIALIZED | BDF_INIT_IN_PROGRESS);
-  BlkDevAdd(bd,FALSE,TRUE);
-  for (i=bd->first_drv_let;i<drv_let2;i++)
-    Fmt(i,,FALSE);
-
-    pd_done:
-  while (root.next!=&root) {
-    temppp=root.next;
-    QueRem(temppp);
-    Free(temppp);
+    tempde=tempde1;
   }
 }
 
-#help_index "Info;File/Cmd Line (Typically);Cmd Line (Typically)"
-
-U0 RedSeaDrvView(U8 drv_let=0)
+I64 Size1(CDirEntry *tempde,I64 *_fuf_flags,I64 round_to)
 {
-  CDrv *dv=Let2Drv(drv_let);
-  I64 lohi,c1,i,x,y,l,s;
-  U8 *bitmap;
-  CDC *dc=DCAlias;
-
-  l=(GR_HEIGHT-3*FONT_HEIGHT)*(GR_WIDTH-FONT_WIDTH<<1),
-	s=(dv->size+dv->spc-1)/dv->spc;
-
-  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
-  WinMax;
-  DocCursor;
-  DocClear;
-  DCFill;
-  try {
-    i=((s+7)>>3+BLK_SIZE-1)>>BLK_SIZE_BITS;
-    bitmap=MAlloc(i<<BLK_SIZE_BITS);
-    RBlks(dv,bitmap,dv->fat1,i);
-    i=0;
-    for (y=0;y<GR_HEIGHT-3*FONT_HEIGHT;y++) {
-      if (ScanKey)
-	break;
-      for (x=0;x<GR_WIDTH-FONT_WIDTH<<1;x++) {
-	lohi=i*s;
-	c1=lohi/l;
-	if (Bt(bitmap,c1))
-	  dc->color=ROP_XOR+BLUE^TRANSPARENT;
-	else
-	  dc->color=ROP_XOR+WHITE^TRANSPARENT;
-	GrPlot(dc,x,y);
-	i++;
-      }
-    }
-    Free(bitmap);
-  } catch
-    DrvUnlock(dv);
-  GetChar;
-
-  SettingsPop;
-  DCFill;
-  DCDel(dc);
-}
-U0 FAT32DrvView(U8 drv_let=0)
-{
-  CDrv *dv=Let2Drv(drv_let);
-  I64 lohi,c1,i,x,y,l,s;
-  U32 *bitmap;
-  CDC *dc=DCAlias;
-  l=(GR_HEIGHT-3*FONT_HEIGHT)*(GR_WIDTH-FONT_WIDTH<<1),
-	s=(dv->size+dv->spc-1)/dv->spc;
-
-  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
-  WinMax;
-  DocCursor;
-  DocClear;
-  DCFill;
-  try {
-    i=(s*4+BLK_SIZE-1)>>BLK_SIZE_BITS;
-    bitmap=MAlloc(i<<BLK_SIZE_BITS);
-    RBlks(dv,bitmap,dv->fat1,i);
-    i=0;
-    for (y=0;y<GR_HEIGHT-3*FONT_HEIGHT;y++) {
-      if (ScanKey)
-	break;
-      for (x=0;x<GR_WIDTH-FONT_WIDTH<<1;x++) {
-	lohi=i*s;
-	c1=lohi/l;
-	if (bitmap[c1])
-	  dc->color=ROP_XOR+BLUE^TRANSPARENT;
-	else
-	  dc->color=ROP_XOR+WHITE^TRANSPARENT;
-	GrPlot(dc,x,y);
-	i++;
-      }
-    }
-    Free(bitmap);
-  } catch
-    DrvUnlock(dv);
-  GetChar;
-
-  SettingsPop;
-  DCFill;
-  DCDel(dc);
-}
-public U0 DrvView(U8 drv_let=0)
-{//Drive view. Graph the allocation map's fragmentation.
-  CDrv *dv=Let2Drv(drv_let),*old_dv=Fs->cur_dv;
-  Drv(drv_let);
-  switch (dv->type) {
-    case DVT_REDSEA:
-      RedSeaDrvView(drv_let);
-      break;
-    case DVT_FAT32:
-      FAT32DrvView(drv_let);
-      break;
-    default:
-      PrintErr("File System Not Supported\n");
-  }
-  Drv(Drv2Let(old_dv));
-}
-
-public U0 DskView(U8 drv_let=0)
-{//Disk view. Pie chart of partition sizes.
-  I64 i,j,
-	h=Fs->pix_width,
-	v=Fs->pix_height,
-	radius;
+  U8 buf[BLK_SIZE];
+  I64 result=0,i;
   CDrv *dv;
-  CBlkDev *bd=Let2BlkDev(drv_let);
-  CDC *dc=DCAlias;
-  F64 sect_start,sect_end;
-
-  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
-  DocCursor;
-  DocClear;
-  DCFill;
-  if (h<v)
-    radius=0.4*h;
-  else
-    radius=0.4*v;
-  dc->color=BLACK;
-  GrCircle(dc,h>>1,v>>1,radius);
-
-  j=1;
-  for (i=0;i<NUM_DRVS;i++) {
-    dv=&blkdev.drvs[i];
-    if (bd==dv->bd && dv->type) {
-      sect_start=-(dv->base_offset*2*ã/(bd->max_blk+1));
-      sect_end	=-((dv->base_offset+dv->size)*2*ã/(bd->max_blk+1));
-      dc->color=BLACK;
-      GrLine(dc,h>>1,v>>1,
-	    h>>1+radius*Cos(sect_start),
-	    v>>1+radius*Sin(sect_start));
-      GrLine(dc,h>>1,v>>1,
-	    h>>1+radius*Cos(sect_end),
-	    v>>1+radius*Sin(sect_end));
-
-      dc->color=j;
-      GrPrint(dc,0,v-FONT_HEIGHT*j,"%C %-8Z",Drv2Let(dv),
-	    dv->type.u16[0],"ST_DRV_TYPES");
-      GrFloodFill(dc,
-	    h>>1+(radius-4)*Cos((sect_start+sect_end)/2),
-	    v>>1+(radius-4)*Sin((sect_start+sect_end)/2),FALSE);
-      j++;
+  while (tempde) {
+    if ((i=tempde->size) && Bt(_fuf_flags,FUf_EXPAND) &&
+	  !(tempde->attr&RS_ATTR_DIR) &&
+	  FileAttr(tempde->name)&RS_ATTR_COMPRESSED) {
+      dv=Let2Drv(*tempde->full_name);
+      RBlks(dv,buf,Cluster2Blk(dv,tempde->cluster),1);
+      i=(&buf)(CArcCompress *)->expanded_size;
     }
+    if (round_to)
+      i=CeilU64(tempde->size,round_to);
+    if (tempde->attr&RS_ATTR_DIR)
+      i+=Size1(tempde->sub,_fuf_flags,round_to);
+    tempde->user_data=i;
+    result+=i;
+    tempde=tempde->next;
   }
+  return result;
+}
+public I64 Size(U8 *files_find_mask="/*",U8 *fu_flags=NULL,I64 round_to=0)
+{//Total size of files in mask. "+x" for expanded size.
+//Does not include directory size of base directory, but
+  //does include size of sub directories.
+  I64 fuf_flags=0,result=0;
+  CDirEntry *tempde1=NULL;
+  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r");
+  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
+  if (tempde1=FilesFind(files_find_mask,fuf_flags&FUG_FILES_FIND)) {
+    fuf_flags&=FUF_EXPAND;
+    result=Size1(tempde1,&fuf_flags,round_to);
+    DirTreeDel(tempde1);
+  }
+  return result;
+}
 
-  GetChar(,FALSE);
-  SettingsPop;
-  DCFill;
-  DCDel(dc);
+public I64 FileCnt(CDirEntry *tempde)
+{//Cnt of files in $LK,"CDirEntry",A="MN:CDirEntry"$ tree.
+  I64 cnt=0;
+  while (tempde) {
+    if (tempde->attr&RS_ATTR_DIR)
+      cnt+=FileCnt(tempde->sub);
+    else
+      cnt++;
+    tempde=tempde->next;
+  }
+  return cnt;
 }
 
 #help_index "File/Cmd Line (Typically);Cmd Line (Typically)"
+public I64 FF(U8 *files_find_mask,U8 *fu_flags=NULL)
+{//Files find. List files matching mask.
+  I64 cnt=0,fuf_flags=0;
+  CDirEntry *tempde,*tempde1;
+  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+f+F");
+  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
+  tempde=tempde1=FilesFind(files_find_mask,fuf_flags);
+  while (tempde) {
+    PutFileLink(tempde->full_name);
+    '\n';
+    cnt++;
+    tempde=tempde->next;
+  }
+  DirTreeDel(tempde1);
+  return cnt;
+}
 
 public I64 Zip(U8 *files_find_mask="*",U8 *fu_flags=NULL)
 {//Compress files by moving to .Z filename.

Adam/ABlkDev/ChkDsk.CPP

@@ -209,11 +209,11 @@ public I64 ChkDsk(U8 drv_let=0,Bool fix=FALSE,Bool confirm=TRUE)
 //You probably want to reformat and reinstall.
   I64 errs=0;
   CDrv *dv=Let2Drv(drv_let);
-  switch (dv->type) {
-    case DVT_REDSEA:
+  switch (dv->fs_type) {
+    case FSt_REDSEA:
       errs=RedSeaChkDsk(drv_let,&fix,&confirm);
       break;
-    case DVT_FAT32:
+    case FSt_FAT32:
       errs=FAT32ChkDsk(drv_let,&fix,&confirm);
       break;
     default:
@@ -228,3 +228,218 @@ public I64 ChkDsk(U8 drv_let=0,Bool fix=FALSE,Bool confirm=TRUE)
   }
   return errs;
 }
+
+U0 RedSeaDrvView(U8 drv_let=0)
+{
+  CDrv *dv=Let2Drv(drv_let);
+  I64 lohi,c1,i,x,y,l,s;
+  U8 *bitmap;
+  CDC *dc=DCAlias;
+
+  l=(GR_HEIGHT-3*FONT_HEIGHT)*(GR_WIDTH-FONT_WIDTH<<1),
+	s=(dv->size+dv->spc-1)/dv->spc;
+
+  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
+  WinMax;
+  DocCursor;
+  DocClear;
+  DCFill;
+  try {
+    i=((s+7)>>3+BLK_SIZE-1)>>BLK_SIZE_BITS;
+    bitmap=MAlloc(i<<BLK_SIZE_BITS);
+    RBlks(dv,bitmap,dv->fat1,i);
+    i=0;
+    for (y=0;y<GR_HEIGHT-3*FONT_HEIGHT;y++) {
+      if (ScanKey)
+	break;
+      for (x=0;x<GR_WIDTH-FONT_WIDTH<<1;x++) {
+	lohi=i*s;
+	c1=lohi/l;
+	if (Bt(bitmap,c1))
+	  dc->color=ROP_XOR+BLUE^TRANSPARENT;
+	else
+	  dc->color=ROP_XOR+WHITE^TRANSPARENT;
+	GrPlot(dc,x,y);
+	i++;
+      }
+    }
+    Free(bitmap);
+  } catch
+    DrvUnlock(dv);
+  GetChar;
+
+  SettingsPop;
+  DCFill;
+  DCDel(dc);
+}
+U0 FAT32DrvView(U8 drv_let=0)
+{
+  CDrv *dv=Let2Drv(drv_let);
+  I64 lohi,c1,i,x,y,l,s;
+  U32 *bitmap;
+  CDC *dc=DCAlias;
+  l=(GR_HEIGHT-3*FONT_HEIGHT)*(GR_WIDTH-FONT_WIDTH<<1),
+	s=(dv->size+dv->spc-1)/dv->spc;
+
+  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
+  WinMax;
+  DocCursor;
+  DocClear;
+  DCFill;
+  try {
+    i=(s*4+BLK_SIZE-1)>>BLK_SIZE_BITS;
+    bitmap=MAlloc(i<<BLK_SIZE_BITS);
+    RBlks(dv,bitmap,dv->fat1,i);
+    i=0;
+    for (y=0;y<GR_HEIGHT-3*FONT_HEIGHT;y++) {
+      if (ScanKey)
+	break;
+      for (x=0;x<GR_WIDTH-FONT_WIDTH<<1;x++) {
+	lohi=i*s;
+	c1=lohi/l;
+	if (bitmap[c1])
+	  dc->color=ROP_XOR+BLUE^TRANSPARENT;
+	else
+	  dc->color=ROP_XOR+WHITE^TRANSPARENT;
+	GrPlot(dc,x,y);
+	i++;
+      }
+    }
+    Free(bitmap);
+  } catch
+    DrvUnlock(dv);
+  GetChar;
+
+  SettingsPop;
+  DCFill;
+  DCDel(dc);
+}
+public U0 DrvView(U8 drv_let=0)
+{//Drive view. Graph the allocation map's fragmentation.
+  CDrv *dv=Let2Drv(drv_let),*old_dv=Fs->cur_dv;
+  Drv(drv_let);
+  switch (dv->fs_type) {
+    case FSt_REDSEA:
+      RedSeaDrvView(drv_let);
+      break;
+    case FSt_FAT32:
+      FAT32DrvView(drv_let);
+      break;
+    default:
+      PrintErr("File System Not Supported\n");
+  }
+  Drv(Drv2Let(old_dv));
+}
+
+public U0 DskView(U8 drv_let=0)
+{//Disk view. Pie chart of partition sizes.
+  I64 i,j,attr,
+	h=Fs->pix_width,
+	v=Fs->pix_height,
+	radius;
+  CDrv *dv;
+  CBlkDev *bd=Let2BlkDev(drv_let);
+  CDC *dc=DCAlias;
+  F64 sect_start,sect_end;
+
+  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
+  DocCursor;
+  DocClear;
+  DCFill;
+  if (h<v)
+    radius=0.4*h;
+  else
+    radius=0.4*v;
+  dc->color=BLACK;
+  GrCircle(dc,h>>1,v>>1,radius);
+
+  j=1;
+  for (i=0;i<NUM_DRVS;i++) {
+    dv=&blkdev.drvs[i];
+    if (bd==dv->bd && dv->fs_type) {
+      sect_start=-(dv->base_offset*2*ã/(bd->max_blk+1));
+      sect_end	=-((dv->base_offset+dv->size)*2*ã/(bd->max_blk+1));
+      dc->color=BLACK;
+      GrLine(dc,h>>1,v>>1,
+	    h>>1+radius*Cos(sect_start),
+	    v>>1+radius*Sin(sect_start));
+      GrLine(dc,h>>1,v>>1,
+	    h>>1+radius*Cos(sect_end),
+	    v>>1+radius*Sin(sect_end));
+
+      attr=DrvTextAttrGet(Drv2Let(dv));
+      dc->color=attr&15;
+      GrPrint(dc,0,v-FONT_HEIGHT*j,"%C %-8Z",Drv2Let(dv),
+	    dv->fs_type,"ST_DRV_TYPES");
+      dc->color.c1=attr>>4;
+      dc->color|=ROPF_DITHER;
+      GrFloodFill(dc,
+	    h>>1+(radius-4)*Cos((sect_start+sect_end)/2),
+	    v>>1+(radius-4)*Sin((sect_start+sect_end)/2),FALSE);
+      j++;
+    }
+  }
+
+  GetChar(,FALSE);
+  SettingsPop;
+  DCFill;
+  DCDel(dc);
+}
+
+I64 RedSeaUnusedDrvSpace(U8 drv_let=0)
+{
+  CDrv *dv=Let2Drv(drv_let);
+  I64 result=0,i,l;
+  U8 *bitmap;
+  try {
+    l=(dv->size+dv->spc-1)/dv->spc;
+    i=((l+7)>>3+BLK_SIZE-1)>>BLK_SIZE_BITS;
+    bitmap=MAlloc(i<<BLK_SIZE_BITS);
+    RBlks(dv,bitmap,dv->fat1,i);
+    for (i=0;i<l;i++)
+      if (!Bt(bitmap,i))
+	result++;
+    Free(bitmap);
+  } catch
+    DrvUnlock(dv);
+  return result*BLK_SIZE*dv->spc;
+}
+I64 FAT32UnusedDrvSpace(U8 drv_let=0)
+{
+  CDrv *dv=Let2Drv(drv_let);
+  I64 result=0,i,l;
+  U32 *bitmap;
+  try {
+    l=(dv->size+dv->spc-1)/dv->spc;
+    i=(l*4+BLK_SIZE-1)>>BLK_SIZE_BITS;
+    bitmap=MAlloc(i<<BLK_SIZE_BITS);
+    RBlks(dv,bitmap,dv->fat1,i);
+    for (i=0;i<l;i++)
+      if (!bitmap[i])
+	result++;
+    Free(bitmap);
+  } catch
+    DrvUnlock(dv);
+  return result*BLK_SIZE*dv->spc;
+}
+public I64 UnusedDrvSpace(U8 drv_let=0)
+{//Returns unused size in bytes.
+  CDrv *dv=Let2Drv(drv_let),*old_dv=Fs->cur_dv;
+  U8 *old_dir=StrNew(Fs->cur_dir);
+  I64 result=0;
+  Drv(drv_let);
+  switch (dv->fs_type) {
+    case FSt_REDSEA:
+      result=RedSeaUnusedDrvSpace(drv_let);
+      break;
+    case FSt_FAT32:
+      result=FAT32UnusedDrvSpace(drv_let);
+      break;
+    default:
+      PrintErr("File System Not Supported\n");
+  }
+  Drv(Drv2Let(old_dv));
+  Cd(old_dir);
+  Free(old_dir);
+  return result;
+}

Adam/ABlkDev/FileMgr.CPP

@@ -217,9 +217,9 @@ U0 FMRebuildDoc(CDoc **_doc,CDirEntry **_root,I64 mode)
   DocPrint(doc,"$$LTBLUE$$");
   for (i=0;i<NUM_DRVS;i++) {
     dv=&blkdev.drvs[i];
-    if (dv->type==DVT_REDSEA||dv->type==DVT_FAT32)
+    if (dv->fs_type==FSt_REDSEA||dv->fs_type==FSt_FAT32)
       FMRebuildDocDrv(Drv2Let(dv),doc,_root,TRUE);
-    else if (dv->type==DVT_ISO9660) {
+    else if (dv->fs_type==FSt_ISO9660) {
       if (dv->bd->flags&BDF_INITIALIZED)
 	tempde=FMRebuildDocDrv(Drv2Let(dv),doc,_root,TRUE);
       else {

Adam/ABlkDev/MakeABlkDev.CPP

@@ -1,7 +1,8 @@
 Cd(__DIR__);;
 #include "ADskA"
-#include "Mount"
 #include "ADskB"
+#include "PrtDsk"
+#include "Mount"
 #include "ChkDsk"
 #include "FileMgr"
 Cd("..");;

Adam/ABlkDev/Mount.CPP

@@ -1,102 +1,114 @@
 #help_index "Install;File/Cmd Line (Typically);Cmd Line (Typically);"
-CDoc *BlkDevPmt(U8 boot_drv_let=0,Bool make_free=FALSE,Bool repartition=FALSE)
-{
-  I64 num_hints,drv_let,type,unit;
+I64 Mount2(U8 boot_drv_let,CDoc *_doc,Bool repartition)
+{//If _doc, called by $LK,"::/Kernel/KCfg.CPP"$ else called by $LK,"Mount",A="MN:Mount"$().
+  I64 cnt,result=0,num_hints,drv_let,type,unit;
   U8 blks_buf[STR_LEN],addr_buf[STR_LEN],base0_buf[STR_LEN],base1_buf[STR_LEN];
   CATARep *root=NULL,*tempha;
+  Bool one_drv,make_free;
   CDoc *doc;
-  "\n****** Mount Drives ******\n"
-	"$$GREEN$$A$$FG$$-$$GREEN$$B$$FG$$ are RAM drives.\n"
-	"$$GREEN$$C$$FG$$-$$GREEN$$S$$FG$$ are hard drives.\n"
-	"$$GREEN$$T$$FG$$-$$GREEN$$Z$$FG$$ are CD/DVD drives.\n"
-	"\nDrive Letter ($$PURPLE$$<ENTER>$$FG$$ to exit):";
-  drv_let=ToUpper(GetChar);
-  '\n';
-  if ('A'<=drv_let<='Z') {
-    doc=DocNew;
-    unit=0;
-    if ('A'<=drv_let<='B') {
-      type=BDT_RAM;
-      "Addr of RAM disk ($$PURPLE$$<ENTER>$$FG$$ to MAlloc):";
-      GetS(addr_buf,STR_LEN);
-      "Blks of 512 bytes:";
-      GetS(blks_buf,STR_LEN);
-    } else {
-      num_hints=ATARep(,,&root);
-      if ('C'<=drv_let<='S')
-	type=BDT_ATA;
-      else
-	type=BDT_ATAPI;
-      if (type==BDT_ATAPI && boot_drv_let)
-	"<ENTER> to use booted CD/DVD\n";
-      do {
-	if (num_hints)
-	  "Enter dev number or\nport with $$PURPLE$$0x$$FG$$ prefix.\n"
-		"I/O Port Base0:\n";
-	else
-	  "Include $$PURPLE$$0x$$FG$$ prefix.\nI/O Port Base0:\n";
-	GetS(base0_buf,STR_LEN);
-      } while (!Str2I64(base0_buf) && (type!=BDT_ATAPI || !boot_drv_let));
-      if (1<=Str2I64(base0_buf)<=num_hints) {
-	tempha=ATARepFind(root,Str2I64(base0_buf));
-	StrPrint(base0_buf,"0x%X",tempha->base0);
-	StrPrint(base1_buf,"0x%X",tempha->base1);
-	unit=tempha->unit;
-      } else if (type!=BDT_ATAPI || *base0_buf) {
-	if (type==BDT_ATAPI)
-	  StrCpy(base1_buf,"0");
-	else
+  boot_drv_let=ToUpper(boot_drv_let);
+  do {
+    cnt=0;
+    if (!_doc)
+      DrvRep;
+    "\n****** Mount Drives ******\n"
+	  "$$GREEN$$A$$FG$$-$$GREEN$$B$$FG$$ are RAM drives.\n"
+	  "$$GREEN$$C$$FG$$-$$GREEN$$S$$FG$$ are ATA hard drives.\n"
+	  "$$GREEN$$T$$FG$$-$$GREEN$$Z$$FG$$ are ATAPI CD/DVD drives.\n"
+	  "\nDrive Letter ($$PURPLE$$<ENTER>$$FG$$ to exit):";
+    drv_let=ToUpper(GetChar);
+    '\n';
+    if (type=Let2BlkDevType(drv_let)) {
+      one_drv=FALSE;
+      if (_doc) { //Called by $LK,"::/Kernel/KCfg.CPP"$
+	doc=_doc;
+	make_free=FALSE;
+      } else { //Called by $LK,"Mount",A="MN:Mount"$()
+	doc=DocNew;
+	DocPrint(doc,"CBlkDev *bd;\n");
+	make_free=TRUE;
+      }
+      unit=0;
+      switch (type) {
+	case BDT_RAM:
+	  type=BDT_RAM;
+	  "Addr of RAM disk ($$PURPLE$$<ENTER>$$FG$$ to MAlloc):";
+	  GetS(addr_buf,STR_LEN);
+	  "Blks of 512 bytes:";
+	  GetS(blks_buf,STR_LEN);
+	  break;
+	case BDT_ATA:
+	case BDT_ATAPI:
+	  num_hints=ATARep(,,&root);
+	  if (type==BDT_ATAPI && boot_drv_let)
+	    "<ENTER> to use booted CD/DVD\n"; //Only $LK,"::/Kernel/KCfg.CPP"$
 	  do {
-	    "I/O Port Base1:\n";
-	    GetS(base1_buf,STR_LEN);
-	  } while (!Str2I64(base1_buf));
-	do {
-	  "\t$$PURPLE$$0$$FG$$=Master\n\t$$PURPLE$$1$$FG$$=Slave\nUnit:";
-	  unit=GetChar-'0';
-	} while (!(0<=unit<=1));
-	'\n';
+	    if (num_hints)
+	      "Enter dev number or\nport with $$PURPLE$$0x$$FG$$ prefix.\n"
+		    "I/O Port Base0:\n";
+	    else
+	      "Include $$PURPLE$$0x$$FG$$ prefix.\nI/O Port Base0:\n";
+	    GetS(base0_buf,STR_LEN);
+	  } while (!Str2I64(base0_buf) && (type!=BDT_ATAPI || !boot_drv_let));
+	  if (1<=Str2I64(base0_buf)<=num_hints) {
+	    tempha=ATARepFind(root,Str2I64(base0_buf));
+	    StrPrint(base0_buf,"0x%X",tempha->base0);
+	    StrPrint(base1_buf,"0x%X",tempha->base1);
+	    unit=tempha->unit;
+	  } else if (type!=BDT_ATAPI || *base0_buf) {
+	    if (type==BDT_ATAPI)
+	      StrCpy(base1_buf,"0");
+	    else
+	      do {
+		"I/O Port Base1:\n";
+		GetS(base1_buf,STR_LEN);
+	      } while (!Str2I64(base1_buf));
+	    do {
+	      "\t$$PURPLE$$0$$FG$$=Master\n\t$$PURPLE$$1$$FG$$=Slave\nUnit:";
+	      unit=GetChar-'0';
+	    } while (!(0<=unit<=1));
+	    '\n';
+	  }
+	  LinkedLstDel(root);
+	  break;
       }
-      LinkedLstDel(root);
-    }
-    DocPrint(doc,"bd=BlkDevNextFree(%d,%d);bd->unit=%d;\n",drv_let,type,unit);
-    if (type==BDT_RAM) {
-      if (!*addr_buf) StrCpy(addr_buf,"0");
-      DocPrint(doc,"bd->RAM_dsk=%s;bd->max_blk=(%s)-1;\n",addr_buf,blks_buf);
-    }
-    if (type==BDT_ATA || type==BDT_ATAPI) {
-      if (type==BDT_ATAPI && !*base0_buf) {
-	DocPrint(doc,"GetBaseUnit(bd);\n");
-	if (drv_let==boot_drv_let)
-	  make_free=TRUE;
-      } else
-	DocPrint(doc,"bd->base0=%s;bd->base1=%s;\n",
-	      base0_buf,base1_buf);
-    }
-    if (type==BDT_ATA && repartition) {
-      "\nReformat WHOLE drive!";
-      if (YorN) {
-	DocPrint(doc,"if (!BlkDevAdd(bd,TRUE,TRUE))"
-	      "\"\n\n$$BK,1$$$$RED$$Operation Failed$$BK,0$$$$FG$$\n\n\";"
-	      "else PrtDsk(bd->first_drv_let);\n");
-	return doc;
+      DocPrint(doc,"bd=BlkDevNextFree(\'%C\',%d);bd->unit=%d;\n",
+	    drv_let,type,unit);
+      switch (type) {
+	case BDT_RAM:
+	  if (!*addr_buf) StrCpy(addr_buf,"0");
+	  DocPrint(doc,"bd->RAM_dsk=%s;bd->max_blk=(%s)-1;\n",
+		addr_buf,blks_buf);
+	  break;
+	case BDT_ATA:
+	case BDT_ATAPI:
+	  if (type==BDT_ATAPI && !*base0_buf) {
+	    DocPrint(doc,"GetBaseUnit(bd);\n"); //Only $LK,"::/Kernel/KCfg.CPP"$
+	    if (drv_let==boot_drv_let)
+	      make_free=TRUE;
+	  } else
+	    DocPrint(doc,"bd->base0=%s;bd->base1=%s;\n",base0_buf,base1_buf);
+	  if (type==BDT_ATA && repartition) {
+	    "\nReformat WHOLE drive!";
+	    one_drv=YorN;
+	  }
+	  break;
+      }
+      DocPrint(doc,"BlkDevAdd(bd,%d,%d);\n",one_drv,make_free);
+      if (_doc) //Called by $LK,"::/Kernel/KCfg.CPP"$
+	cnt++;
+      else { //Called by $LK,"Mount",A="MN:Mount"$()
+	if ((cnt=ExeDoc(doc)) && one_drv)
+	  PrtDsk(drv_let);
+	DocDel(doc);
       }
     }
-    DocPrint(doc,"if (!BlkDevAdd(bd,FALSE,%d))"
-	  "\"\n\n$$BK,1$$$$RED$$Operation Failed$$BK,0$$$$FG$$\n\n\";\n",make_free);
-    return doc;
-  } else
-    return NULL;
+    result+=cnt;
+  } while (cnt || !result && _doc); //At least 1 if Called by $LK,"::/Kernel/KCfg.CPP"$
+  return result;
 }
 
-public U0 Mount(Bool repartition=FALSE)
-{//Mount a drive.
-  CDoc *doc;
-  ExePrint("CBlkDev *bd;"); //Leaks
-  do {
-    DrvRep;
-    if (doc=BlkDevPmt(,TRUE,repartition)) {
-      ExeDoc(doc);
-      DocDel(doc);
-    }
-  } while (doc);
+public I64 Mount(Bool repartition=FALSE)
+{//Mount drives.
+  return Mount2(0,NULL,repartition);
 }

Adam/ABlkDev/PrtDsk.CPP

@@ -0,0 +1,163 @@
+#help_index "Install;File/Cmd Line (Typically);Cmd Line (Typically)"
+
+#define ROUND_DRV_TO	(63*255)
+#define DRV_HEADER	63
+
+class CPlannedDrv
+{
+  CPlannedDrv *next,*last;
+  I64 size;
+  Bool pri;
+};
+
+//Available to assist in writing scripts.
+I64 drv_dsk_dsk_size=0;
+
+public I64 PrtDsk(U8 drv_let=0)
+{//Partition the disk containing partition drv_let.
+//drv_let=0 means add new drive that
+  //is not already mounted.
+  CBlkDev *bd;
+  CPlannedDrv root,*temppp;
+  CMasterBoot mbr;
+  Bool pri=TRUE;
+  I64 ext_base,drv_let2,pri_cnt=0,
+	i,start_offset,offset,remaining;
+  drv_dsk_dsk_size=0;
+  "This command does not play well\n"
+	"with other operating systems.\n"
+	"You really should use another\n"
+	"operating system's partitioner.\n"
+	"If you use this, it may, in fact,\n"
+	"make your hard drive impossible\n"
+	"to repartition with other operating\n"
+	"until you set block zero to zero\n"
+	"with $$LK,\"MasterBootZero\",\"MN:MasterBootZero\"$$()\n\n\n"
+	"Continue";
+  if (!YorN) return 0;
+  if (drv_let && !Let2BlkDev(drv_let,FALSE))
+    drv_let=0;
+  if (!drv_let) {
+    Mount(TRUE);
+    return 0;
+  }
+  if (!(bd=Let2BlkDev(drv_let,FALSE)) || bd->type!=BDT_ATA)
+    return 0;
+
+  drv_dsk_dsk_size=bd->max_blk+1;
+  QueInit(&root);
+  drv_let2=bd->first_drv_let;
+  remaining=FloorU64(bd->max_blk+1,ROUND_DRV_TO);
+  while (FloorU64(remaining,ROUND_DRV_TO)>=ROUND_DRV_TO) {
+    temppp=MAlloc(sizeof(CPlannedDrv));
+    do {
+      "$$RED$$Partition %C$$FG$$\n",drv_let2;
+      temppp->pri=FALSE;
+      if (pri) {
+	"Primary Partition";
+	if (YorN) {
+	  pri_cnt++;
+	  temppp->pri=TRUE;
+	  if (pri_cnt==3)
+	    pri=FALSE;
+	} else
+	  pri=FALSE;
+      }
+      "Blocks Remaining:%d (0x%X)\n",
+	    remaining-DRV_HEADER,remaining-DRV_HEADER;
+      temppp->size=CeilU64(GetI64("Size in Blocks  :",
+	    remaining-DRV_HEADER)+DRV_HEADER,ROUND_DRV_TO);
+    } while (!(ROUND_DRV_TO<=temppp->size<=FloorU64(remaining,ROUND_DRV_TO)));
+    QueIns(temppp,root.last);
+    remaining-=temppp->size;
+    drv_let2++;
+  }
+
+  "\n\n!!! Repartition Drive !!!\n\n";
+  temppp=root.next;
+  drv_let2=bd->first_drv_let;
+  while (temppp!=&root) {
+    "Drive %C:%08X ",drv_let2,temppp->size;
+    if (temppp->pri)
+      "Primary\n";
+    else
+      "Logical\n";
+    temppp=temppp->next;
+    drv_let2++;
+  }
+  if (!AreYouSure)
+    goto pd_done;
+
+  remaining=FloorU64(bd->max_blk+1,ROUND_DRV_TO)-ROUND_DRV_TO;
+  temppp=root.next;
+  MemSet(&mbr,0,BLK_SIZE);
+  mbr.signature=0xAA55;
+  offset=0;
+  for (i=0;i<pri_cnt;i++) {
+    mbr.p[i].active=0x80;
+    mbr.p[i].start_head=0;
+    mbr.p[i].start_cyl=0x101;
+    mbr.p[i].type=1; //Will get set different.
+    mbr.p[i].end_head=0xFE;
+    mbr.p[i].end_cyl=0xFFFF;
+    mbr.p[i].offset=DRV_HEADER+offset;
+    mbr.p[i].size=temppp->size-DRV_HEADER;
+    offset+=temppp->size;
+    remaining-=temppp->size;
+    temppp=temppp->next;
+  }
+  if (!i) i++;
+  if (temppp!=&root) {
+    mbr.p[i].active=0x80;
+    mbr.p[i].start_head=0;
+    mbr.p[i].start_cyl=0x101;
+    mbr.p[i].type=0xF;
+    mbr.p[i].end_head=0xFE;
+    mbr.p[i].end_cyl=0xFFFF;
+    mbr.p[i].offset=offset;
+    mbr.p[i].size=remaining;
+    ext_base=offset;
+  }
+  ATAWriteBlks(bd,&mbr,0,1);
+
+  while (temppp!=&root) {
+    start_offset=offset;
+    MemSet(&mbr,0,BLK_SIZE);
+    mbr.signature=0xAA55;
+
+    mbr.p[0].active=0x80;
+    mbr.p[0].start_head=1;
+    mbr.p[0].start_cyl=0x101;
+    mbr.p[0].type=1; //Will get set different.
+    mbr.p[0].end_head=0xFE;
+    mbr.p[0].end_cyl=0xFFFF;
+    mbr.p[0].offset=DRV_HEADER;
+    mbr.p[0].size=temppp->size-DRV_HEADER;
+    offset+=temppp->size;
+    temppp=temppp->next;
+    if (temppp!=&root) {
+      mbr.p[1].active=0x80;
+      mbr.p[1].start_head=0;
+      mbr.p[1].start_cyl=0x101;
+      mbr.p[1].type=5;
+      mbr.p[1].end_head=0xFE;
+      mbr.p[1].end_cyl=0xFFFF;
+      mbr.p[1].offset=offset-ext_base;
+      mbr.p[1].size=temppp->size;
+    }
+    ATAWriteBlks(bd,&mbr,start_offset,1);
+  }
+
+  bd->flags&=~(BDF_INITIALIZED | BDF_INIT_IN_PROGRESS);
+  BlkDevAdd(bd,FALSE,TRUE);
+  for (i=bd->first_drv_let;i<drv_let2;i++)
+    Fmt(i,,FALSE);
+
+pd_done:
+  while (root.next!=&root) {
+    temppp=root.next;
+    QueRem(temppp);
+    Free(temppp);
+  }
+  return drv_dsk_dsk_size;
+}