From 79ac2b651fd6b2a84a3767777c01062d02b730b7 Mon Sep 17 00:00:00 2001 From: Michael Mikonos <127171689+mknos@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:35:17 +0800 Subject: [PATCH 01/11] Str2I64() octal prefix 0o * Comment at top of function hints that 0o18 is treated as an octal number but it is not * Adding the appropriate switch-case makes it work by adjusting radix * Update comment: this function is more like strtol() because it returns a signed result * This function doesn't behave like strtol() because "0" prefix can't be used for octal, e.g. "0777" (maybe it could be supported in future) --- src/Kernel/StrScan.ZC | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Kernel/StrScan.ZC b/src/Kernel/StrScan.ZC index d785e5a2..b008ec4b 100755 --- a/src/Kernel/StrScan.ZC +++ b/src/Kernel/StrScan.ZC @@ -1,5 +1,5 @@ I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL) -{//String to I64. Similar to strtoul(). +{//String to I64. Similar to strtol(). //Allows radix change with "0x20" "0b1010" "0d123" "0o18". //Be careful of Str2I64("0b101", 16)-->0xB101. Bool neg = FALSE; @@ -32,6 +32,7 @@ I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL) switch (ch) { case 'B': radix = 2; st++; break; + case 'O': radix = 8; st++; break; case 'D': radix = 10; st++; break; case 'X': radix = 16; st++; break; } @@ -86,13 +87,13 @@ to avoid this. } if (!StrNCompare(src - 1, "inf", 3)) { - d=ì; + d=ì; src += 3; goto a2f_end; } - if (*src == 'ì') + if (*src == 'ì') { - d = ì; + d = ì; src++; goto a2f_end; } From 0d82978c55ca4494ecb7b6fafe61818061f38865 Mon Sep 17 00:00:00 2001 From: Michael Mikonos Date: Mon, 7 Aug 2023 08:52:53 +0800 Subject: [PATCH 02/11] undo unintended file conversion --- src/Kernel/StrScan.ZC | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Kernel/StrScan.ZC b/src/Kernel/StrScan.ZC index b008ec4b..5dd2a2df 100755 --- a/src/Kernel/StrScan.ZC +++ b/src/Kernel/StrScan.ZC @@ -87,13 +87,13 @@ to avoid this. } if (!StrNCompare(src - 1, "inf", 3)) { - d=ì; + d=ì; src += 3; goto a2f_end; } - if (*src == 'ì') + if (*src == 'ì') { - d = ì; + d = ì; src++; goto a2f_end; } From ed0afb2bb5b253de2af70223d6771b3b11201b64 Mon Sep 17 00:00:00 2001 From: Michael Mikonos Date: Mon, 21 Aug 2023 21:26:08 +0800 Subject: [PATCH 03/11] * By default, print_all_length is 64 and i counts from 0 to 63, covering all bits of flags * Bt(&flags,64) probably doesn't make sense, so it might be safer to set a maximum cap value * I have not tested this --- src/Kernel/StrB.ZC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kernel/StrB.ZC b/src/Kernel/StrB.ZC index 89bb0cfb..631c96b4 100755 --- a/src/Kernel/StrB.ZC +++ b/src/Kernel/StrB.ZC @@ -212,7 +212,7 @@ U8 *FlagsStrPrint(U8 *dst, U8 *list, I64 flags, Bool print_all=FALSE, I64 print_ I64 i = 0; *dst = 0; - if (!print_all_length) + if (!print_all_length || print_all_length > 64) print_all_length = 64; while (i < print_all_length) { From c69e0c82464a3d7a3aa46dc8553d4030cbafe66f Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Thu, 24 Aug 2023 22:22:21 +0900 Subject: [PATCH 04/11] ignore hidden files/folders --- .gitignore | 1 + build/sync.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 127eb5d8..c70a27dc 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ *.o *.d /zealbooter/limine.h +*. \ No newline at end of file diff --git a/build/sync.sh b/build/sync.sh index 54227f8c..6a4d7321 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -95,7 +95,7 @@ else vm) mount_vdisk echo "Copying src to vdisk..." - sudo cp -r ../src/* $TMPMOUNT + sudo rsync -av --exclude='.*' ../src/ $TMPMOUNT/ umount_vdisk echo "Finished." ;; From 88a138498330d391e655eee52f90a296483b2503 Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Thu, 24 Aug 2023 22:26:08 +0900 Subject: [PATCH 05/11] fix --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c70a27dc..a0b43089 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,4 @@ *.o *.d /zealbooter/limine.h -*. \ No newline at end of file +src/.* \ No newline at end of file From c5fcbe24cf73766e540a6d5f9694913ec29ab57f Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Fri, 25 Aug 2023 16:17:27 +0900 Subject: [PATCH 06/11] use find and cp instead --- build/sync.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/sync.sh b/build/sync.sh index 6a4d7321..f7d828f5 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -95,7 +95,8 @@ else vm) mount_vdisk echo "Copying src to vdisk..." - sudo rsync -av --exclude='.*' ../src/ $TMPMOUNT/ + cd ../src/ + sudo find . \( ! -path './.*' -and ! -name '.*' \) -and ! -path '*/.*/*' -type f -exec cp --parents {} $TMPMOUNT/ \; umount_vdisk echo "Finished." ;; From 8b1d036e820e79666407e24f84099a67eb72f5df Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:11:23 +0900 Subject: [PATCH 07/11] added --ignore-dots argument --- build/sync.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build/sync.sh b/build/sync.sh index f7d828f5..d4f39c9e 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -94,9 +94,17 @@ else ;; vm) mount_vdisk - echo "Copying src to vdisk..." - cd ../src/ - sudo find . \( ! -path './.*' -and ! -name '.*' \) -and ! -path '*/.*/*' -type f -exec cp --parents {} $TMPMOUNT/ \; + case $2 in + --ignore-dots | --dots) + echo "Copying src to vdisk ignoring dotfiles and dotfolders..." + cd ../src/ + sudo find . \( ! -path './.*' -and ! -name '.*' \) -and ! -path '*/.*/*' -type f -exec cp --parents {} $TMPMOUNT/ \; + ;; + *) + echo "Copying entire src to vdisk..." + sudo cp -r ../src/* $TMPMOUNT + ;; + esac umount_vdisk echo "Finished." ;; From 136df9cbc22621c0eaebd0f3f8d457ab7b81d6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=83=AB=E3=82=BA?= <8145020+y4my4my4m@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:11:59 +0900 Subject: [PATCH 08/11] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index a0b43089..127eb5d8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ *.o *.d /zealbooter/limine.h -src/.* \ No newline at end of file From 26e0304999a750f127f949f217827bd38f1809f3 Mon Sep 17 00:00:00 2001 From: Sharoy Veduchi <61427449+doodayev@users.noreply.github.com> Date: Mon, 2 Oct 2023 21:49:24 -0700 Subject: [PATCH 09/11] Remove "MagicISO" trademark. Maybe in the past the word "MagicISO" was used for something but I don't see it here. Therefore I suggest removing it. --- src/Doc/GuideLines.DD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Doc/GuideLines.DD b/src/Doc/GuideLines.DD index 1aafbff1..b0ae90c4 100755 --- a/src/Doc/GuideLines.DD +++ b/src/Doc/GuideLines.DD @@ -130,4 +130,4 @@ $FG$ * RAX holds function return values, of course. $FG,8$ -* "MagicISO" is a trademark owned by MagicISO Corp. + From 577d8979c37c16774b2aaf9ce0b1ee1666f9ae6b Mon Sep 17 00:00:00 2001 From: Arsenic Blood <127725014+GutPuncher@users.noreply.github.com> Date: Tue, 3 Oct 2023 02:29:16 -0400 Subject: [PATCH 10/11] Update GuideLines.DD --- src/Doc/GuideLines.DD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Doc/GuideLines.DD b/src/Doc/GuideLines.DD index b0ae90c4..e73e8843 100755 --- a/src/Doc/GuideLines.DD +++ b/src/Doc/GuideLines.DD @@ -129,5 +129,5 @@ $FG$ * No args are passed in registers. * RAX holds function return values, of course. -$FG,8$ + From e35fe7962ccc367379fb31e76c20c0838eb1548c Mon Sep 17 00:00:00 2001 From: Arsenic Blood <127725014+GutPuncher@users.noreply.github.com> Date: Wed, 4 Oct 2023 01:23:43 -0400 Subject: [PATCH 11/11] Update sync.sh --- build/sync.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/sync.sh b/build/sync.sh index d4f39c9e..152cb605 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -44,11 +44,11 @@ DOCS_DIR= TMPMOUNT=/tmp/zealtmp print_usage() { - echo "Usage: $0 [ repo | vm ]" - echo - echo " repo - overwrites src/ with virtual disk contents." - echo " vm - overwrites virtual disk with src/ contents." - echo + echo "Usage: $0 ( repo | vm ) [OPTION]" + echo " repo Overwrites src/ with virtual disk contents." + echo " vm Overwrites virtual disk with src/ contents." + echo "Options:" + echo " --ignore-dots Ignore dotfiles/dotfolders during synchronize." } mount_vdisk() {