From 9ebbb0847b5743c55122ababb9671ec70cf951e0 Mon Sep 17 00:00:00 2001 From: TomAwezome Date: Fri, 3 Dec 2021 23:07:34 -0500 Subject: [PATCH] Fix `Mount2` allowing skipping HDD SATA port entry. Rename network stack `Run.CC` to `Start.CC`, fix running applications in subdirectories using F5 in `Ed` window. --- .gitignore | 2 -- build/sync_vm.sh | 1 - src/Home/Net/{Run.CC => Start.CC} | 0 src/System/BlkDev/Mount.CC | 10 +++++----- 4 files changed, 5 insertions(+), 8 deletions(-) rename src/Home/Net/{Run.CC => Start.CC} (100%) diff --git a/.gitignore b/.gitignore index b81ed121..77a643df 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,3 @@ *.MAP Boot/ ZealOS-*.iso -sync_repo.sh -sync_vm.sh diff --git a/build/sync_vm.sh b/build/sync_vm.sh index 2eea8701..0071fa88 100755 --- a/build/sync_vm.sh +++ b/build/sync_vm.sh @@ -27,4 +27,3 @@ sudo qemu-nbd -d /dev/nbd0 sudo rm -rf /tmp/zealtmp sudo sync echo "finished." -git status diff --git a/src/Home/Net/Run.CC b/src/Home/Net/Start.CC similarity index 100% rename from src/Home/Net/Run.CC rename to src/Home/Net/Start.CC diff --git a/src/System/BlkDev/Mount.CC b/src/System/BlkDev/Mount.CC index 2711c215..48dad46d 100755 --- a/src/System/BlkDev/Mount.CC +++ b/src/System/BlkDev/Mount.CC @@ -221,11 +221,11 @@ U8 Mount2(U8 boot_drive_let, CDoc *_doc, Bool _caller_is_prtdisk) "Enter port number: \n"; StrNGet(port_str, STR_LEN); } - while (( type == BDT_ATAPI && AHCIPortSignatureGet(Str2I64(port_str)) != AHCI_PxSIG_ATAPI || - type == BDT_ATA && AHCIPortSignatureGet(Str2I64(port_str)) != AHCI_PxSIG_ATA || - 0 > Str2I64(port_str) || Str2I64(port_str) > num_hints - 1 - ) && - (type != BDT_ATAPI || !boot_drive_let)); + while ((type == BDT_ATAPI && AHCIPortSignatureGet(Str2I64(port_str)) != AHCI_PxSIG_ATAPI || + type == BDT_ATA && AHCIPortSignatureGet(Str2I64(port_str)) != AHCI_PxSIG_ATA || + type == BDT_ATA && !*port_str || + 0 > Str2I64(port_str) || Str2I64(port_str) > num_hints - 1 + ) && (type != BDT_ATAPI || !boot_drive_let)); port = Str2I64(port_str); break;