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

Merge branch 'master' into misc-zealbooter-updates

Browse source
This commit is contained in:
Arsenic Blood 2023-10-08 09:01:00 -04:00 committed by GitHub
commit 6fe5ca4188
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
build/sync.sh
View file

@ -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() {
@ -94,8 +94,17 @@ else
;;
vm)
mount_vdisk
echo "Copying src to vdisk..."
sudo cp -r ../src/* $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."
;;

4
src/Doc/GuideLines.DD
View file

@ -129,5 +129,5 @@ $FG$
* No args are passed in registers.
* RAX holds function return values, of course.
$FG,8$
* "MagicISO" is a trademark owned by MagicISO Corp.

2
src/Kernel/StrB.ZC
View file

@ -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)
{

3
src/Kernel/StrScan.ZC
View file

@ -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;
}