tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 15:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix IS09660 code formatting.

Browse source
This commit is contained in:
TomAwezome 2022-04-16 17:55:26 -04:00
parent 88fe6b59ba
commit 872e1a1385
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Kernel/BlkDev/FileSysISO.ZC
View file

@ -74,7 +74,7 @@ Bool ISOCDirFill(CDirEntry *tmpde, CISODirEntry *de)
tmpde->clus = de->loc.little; tmpde->clus = de->loc.little;
tmpde->size = de->size.little; tmpde->size = de->size.little;
tmpde->attr = FileAttr(tmpde->name); tmpde->attr = FileAttr(tmpde->name);
if (de->flags &ISO_ATTR_DIR) if (de->flags & ISO_ATTR_DIR)
tmpde->attr |= RS_ATTR_DIR; tmpde->attr |= RS_ATTR_DIR;
tmpde->datetime = ISODateStruct2CDate(&de->date); tmpde->datetime = ISODateStruct2CDate(&de->date);
@ -89,7 +89,7 @@ Bool ISOFileFind(CDrive *drive, I64 cur_dir_clus, U8 *name, CDirEntry *_res, I64
Bool res = FALSE, unlock; Bool res = FALSE, unlock;
I64 i; I64 i;
if (fuf_flags &~FUG_FILE_FIND) if (fuf_flags & ~FUG_FILE_FIND)
throw ('FUF'); throw ('FUF');
DriveCheck(drive); DriveCheck(drive);
if (drive->fs_type != FSt_ISO9660) if (drive->fs_type != FSt_ISO9660)
@ -208,7 +208,7 @@ CDirEntry *ISOFilesFind(U8 *files_find_mask, I64 fuf_flags, CDirEntry *parent =
I64 i, cur_dir_clus = Name2DirClus(drive, Fs->cur_dir); I64 i, cur_dir_clus = Name2DirClus(drive, Fs->cur_dir);
CDirEntry *res = NULL, *tmpde; CDirEntry *res = NULL, *tmpde;
if (fuf_flags &~FUG_FILES_FIND) if (fuf_flags & ~FUG_FILES_FIND)
throw ('FUF'); throw ('FUF');
isoptr = MAlloc(drive->spc << BLK_SIZE_BITS); isoptr = MAlloc(drive->spc << BLK_SIZE_BITS);
ClusRead(drive, isoptr, cur_dir_clus, 1); ClusRead(drive, isoptr, cur_dir_clus, 1);
@ -216,7 +216,7 @@ CDirEntry *ISOFilesFind(U8 *files_find_mask, I64 fuf_flags, CDirEntry *parent =
{ {
//curdir //curdir
i = (isoptr->size.little + drive->spc << BLK_SIZE_BITS - 1) / drive->spc << BLK_SIZE_BITS; i = (isoptr->size.little + drive->spc << BLK_SIZE_BITS - 1) / drive->spc << BLK_SIZE_BITS;
buf = MAlloc(drive->spc << BLK_SIZE_BITS *i); buf = MAlloc(drive->spc << BLK_SIZE_BITS * i);
ClusRead(drive, buf, cur_dir_clus, i); ClusRead(drive, buf, cur_dir_clus, i);
Free(isoptr); Free(isoptr);
} }
@ -254,7 +254,7 @@ CDirEntry *ISOFilesFind(U8 *files_find_mask, I64 fuf_flags, CDirEntry *parent =
else else
{ {
tmpde->full_name = FileNameAbs(tmpde->name); tmpde->full_name = FileNameAbs(tmpde->name);
if ((tmpde->attr &RS_ATTR_DIR || !Bt(&fuf_flags, FUf_JUST_DIRS)) && if ((tmpde->attr & RS_ATTR_DIR || !Bt(&fuf_flags, FUf_JUST_DIRS)) &&
!(Bt(&fuf_flags, FUf_RECURSE) && *tmpde->name == '.' && tmpde->attr & RS_ATTR_DIR) && !(Bt(&fuf_flags, FUf_RECURSE) && *tmpde->name == '.' && tmpde->attr & RS_ATTR_DIR) &&
FilesFindMatch(tmpde->full_name, files_find_mask, fuf_flags)) FilesFindMatch(tmpde->full_name, files_find_mask, fuf_flags))
{ {

1
src/System/BlkDev/FileMgr.ZC
View file

@ -486,6 +486,7 @@ U0 FMMakeISO(CDoc *doc, I64 type)
case FSt_REDSEA: case FSt_REDSEA:
RedSeaISO(, tmpde->full_name); RedSeaISO(, tmpde->full_name);
break; break;
case FSt_ISO9660: case FSt_ISO9660:
if (tmpde->full_name[StrLen(tmpde->full_name) - 1] == '/') if (tmpde->full_name[StrLen(tmpde->full_name) - 1] == '/')
st = MStrPrint("%s*", tmpde->full_name); st = MStrPrint("%s*", tmpde->full_name);

4
src/System/Boot/DiskISO9660.ZC
View file

@ -512,8 +512,8 @@ public I64 ISO9660ISO(U8 *_filename = NULL, U8 *src_files_find_mask,
FBlkWrite(out_file, iso_term, 19 << 2, 4); FBlkWrite(out_file, iso_term, 19 << 2, 4);
stage2_size = (Size(stage2_filename, "+s") + DVD_BLK_SIZE - 1) / DVD_BLK_SIZE; stage2_size = (Size(stage2_filename, "+s") + DVD_BLK_SIZE - 1) / DVD_BLK_SIZE;
MemCopy(stage1_buf, BDVD_START, BDVD_END - BDVD_START); MemCopy(stage1_buf, BDVD_START, BDVD_END - BDVD_START);
*(BDVD_BLK_COUNT - BDVD_START + stage1_buf)(U16*) = stage2_size; *(BDVD_BLK_COUNT - BDVD_START + stage1_buf)(U16 *) = stage2_size;
*(BDVD_BLK_LO - BDVD_START + stage1_buf)(U32*) = stage2_blk; *(BDVD_BLK_LO - BDVD_START + stage1_buf)(U32 *) = stage2_blk;
"$$RED$$!!! Boot Stage 2 !!! %X-%X$$FG$$\n", "$$RED$$!!! Boot Stage 2 !!! %X-%X$$FG$$\n",
stage2_blk, stage2_blk + stage2_size - 1; stage2_blk, stage2_blk + stage2_size - 1;
FBlkWrite(out_file, stage1_buf, 20 << 2 + 1 << 2, DVD_BOOT_LOADER_SIZE / BLK_SIZE); FBlkWrite(out_file, stage1_buf, 20 << 2 + 1 << 2, DVD_BOOT_LOADER_SIZE / BLK_SIZE);