Cleanup

Makefile

@@ -79,17 +79,17 @@ $(iso): $(kernel) $(grub_cfg) $(rust_shell)
 
 $(disk): $(kernel) $(rust_shell) $(rust_init) $(cross_cpp)
 	#echo fake install_os
-	sudo disk_scripts/install_os.sh
+	sudo disk-scripts/install_os.sh
 
 $(vdi): $(disk)
-	disk_scripts/make_vdi.sh
-	disk_scripts/attach_vdi.sh
+	disk-scripts/make_vdi.sh
+	disk-scripts/attach_vdi.sh
 
 $(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script)
 	ld -n --whole-archive --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os)
 
 usb: $(kernel)
-	sudo disk_scripts/install_usb.sh $(usb_dev)
+	sudo disk-scripts/install_usb.sh $(usb_dev)
 
 cargo:
 ifdef dev
@@ -102,7 +102,7 @@ toolchain: $(cross_cpp)
 	sysroot/build.sh check_build
 
 fsck:
-	sudo disk_scripts/fsck_disk.sh
+	sudo disk-scripts/fsck_disk.sh
 
 $(cross_cpp): toolchain
 

README.md

@@ -32,7 +32,7 @@ https://github.com/rafalmiel/cykusz-rs/assets/3881998/afa514a1-f435-4eeb-8c80-20
 
 ## Userspace
 
-- [x] Basic shell
+- [x] Bash shell
 - [x] libc (mlibc port)
 - [x] Exec/fork
 - [x] Threads
@@ -92,7 +92,7 @@ rustup override set nightly
 rustup component add rust-src
 make
 
-./create_disk.sh
+./disk-scripts/create_disk.sh
 ```
 
 ## Building Userspace

cleanup.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-cargo fix -p cykusz-rs -p user-alloc -p syscall-user -p syscall-defs --lib --allow-dirty --allow-staged
 cargo fmt

create_vbox_vm.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-VBoxManage import cykusz.ova
+VBoxManage import sysroot/cfg/cykusz.ova

cykusz-rs/src/drivers/ps2/kbd/handler.rs

@@ -9,12 +9,12 @@ use crate::kernel::device::Device;
 use crate::kernel::fs::inode::INode;
 use crate::kernel::fs::poll::PollTable;
 use crate::kernel::fs::vfs::FsError;
+use crate::kernel::timer::current_ns;
+use crate::kernel::utils::wait_queue::WaitQueueFlags;
 use syscall_defs::events::{Event, EventType};
 use syscall_defs::poll::PollEventFlags;
-use syscall_defs::OpenFlags;
 use syscall_defs::time::Timeval;
-use crate::kernel::timer::current_ns;
-use crate::kernel::utils::wait_queue::WaitQueueFlags;
+use syscall_defs::OpenFlags;
 
 use super::scancode;
 

cykusz-rs/src/drivers/ps2/mouse/handler.rs

@@ -6,16 +6,16 @@ use crate::kernel::fs::vfs::FsError;
 use crate::kernel::sync::Spin;
 use crate::kernel::timer::current_ns;
 use crate::kernel::utils::buffer::BufferQueue;
+use crate::kernel::utils::wait_queue::WaitQueueFlags;
 use alloc::string::String;
 use alloc::sync::{Arc, Weak};
 use bit_field::BitField;
 use spin::Once;
-use syscall_defs::events::{Event, EventType};
 use syscall_defs::events::buttons::{ButtonCode, RelCode};
+use syscall_defs::events::{Event, EventType};
 use syscall_defs::poll::PollEventFlags;
-use syscall_defs::OpenFlags;
 use syscall_defs::time::Timeval;
-use crate::kernel::utils::wait_queue::WaitQueueFlags;
+use syscall_defs::OpenFlags;
 
 struct MouseState {
     state: Spin<State>,
@@ -60,7 +60,7 @@ impl<'a> StateIter<'a> {
             0 => Some(ButtonCode::BTN_LEFT),
             1 => Some(ButtonCode::BTN_RIGHT),
             2 => Some(ButtonCode::BTN_MIDDLE),
-            _ => None
+            _ => None,
         }
     }
 
@@ -90,7 +90,7 @@ impl<'a> Iterator for StateIter<'a> {
                     typ: EventType::Key,
                     code: btn_code as u16,
                     val: if self.state.btn_state[idx] { 1 } else { 0 },
-                })
+                });
             }
         }
 
@@ -103,7 +103,7 @@ impl<'a> Iterator for StateIter<'a> {
                     typ: EventType::Rel,
                     code: RelCode::REL_X as u16,
                     val: rel_x,
-                })
+                });
             }
         }
 
@@ -116,7 +116,7 @@ impl<'a> Iterator for StateIter<'a> {
                     typ: EventType::Rel,
                     code: RelCode::REL_Y as u16,
                     val: rel_y,
-                })
+                });
             }
         }
 

cykusz-rs/src/kernel/net/tcp/socket.rs

@@ -904,9 +904,12 @@ impl Socket {
     }
 
     fn read(&self, offset: usize, buf: &mut [u8], flags: MsgFlags) -> Result<usize> {
-        Ok(self
-            .in_buffer
-            .read_data_from(offset, buf, flags.contains(MsgFlags::MSG_PEEK), WaitQueueFlags::empty())?)
+        Ok(self.in_buffer.read_data_from(
+            offset,
+            buf,
+            flags.contains(MsgFlags::MSG_PEEK),
+            WaitQueueFlags::empty(),
+        )?)
     }
 
     fn update_window(&self) {

cykusz-rs/src/kernel/utils/buffer.rs

@@ -125,7 +125,6 @@ impl BufferQueue {
         }
 
         written
-
     }
 
     pub fn append_data(&self, data: &[u8]) -> crate::kernel::fs::vfs::Result<usize> {
@@ -175,7 +174,7 @@ impl BufferQueue {
         offset: usize,
         buf: &mut [u8],
         transient: bool,
-        wg_flags: WaitQueueFlags
+        wg_flags: WaitQueueFlags,
     ) -> SignalResult<usize> {
         if offset > 0 && !transient {
             return Ok(0);

disk-scripts/create_disk.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+user=$USER
+
+SPATH=$(dirname $(readlink -f "$0"))
+CYKUSZ_DIR=$(realpath $SPATH/..)
+
+sudo $CYKUSZ_DIR/disk-scripts/make_disk.sh $user
+sleep 1
+sudo $CYKUSZ_DIR/disk-scripts/install_grub.sh

remove_trailing_whitespace.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-find ./src -type f -exec sed --in-place 's/[[:space:]]\+$//' {} \+
+find ./cykusz-rs/src -type f -exec sed --in-place 's/[[:space:]]\+$//' {} \+

syscall-defs/src/events/buttons.rs

@@ -14,4 +14,4 @@ pub enum ButtonCode {
 pub enum RelCode {
     REL_X = 0x00,
     REL_Y = 0x01,
-}
+}

syscall-defs/src/events/mod.rs

@@ -1,7 +1,7 @@
 use crate::time::Timeval;
 
-pub mod keys;
 pub mod buttons;
+pub mod keys;
 
 #[repr(u16)]
 #[derive(Debug)]

syscall-defs/src/time.rs

@@ -47,4 +47,4 @@ impl Timeval {
     pub fn to_nanoseconds(&self) -> usize {
         self.secs as usize * 1000000000usize + self.usecs as usize * 1000usize
     }
-}
+}

sysroot/build.sh

@@ -394,11 +394,11 @@ function _sysroot {
     mkdir -p $BUILD_DIR
 
     rm -rf $MLIBC_BUILD_DIR
-    meson setup --cross-file $SPATH/cross-file.ini --prefix /usr -Dlinux_kernel_headers=$SYSROOT/usr/include -Dheaders_only=true $MLIBC_BUILD_DIR $MLIBC_SRC_DIR
+    meson setup --cross-file $SPATH/cfg/cross-file.ini --prefix /usr -Dlinux_kernel_headers=$SYSROOT/usr/include -Dheaders_only=true $MLIBC_BUILD_DIR $MLIBC_SRC_DIR
     meson install -C $MLIBC_BUILD_DIR --destdir=$SYSROOT
 
     mkdir -p $SYSROOT/etc
-    cp $SPATH/resolv.conf $SYSROOT/etc/
+    cp $SPATH/cfg/resolv.conf $SYSROOT/etc/
 }
 
 function _binutils {
@@ -456,7 +456,7 @@ function _mlibc {
     mkdir -p $BUILD_DIR
 
     rm -rf $MLIBC_BUILD_DIR
-    meson setup --cross-file $SPATH/cross-file.ini --prefix /usr -Ddefault_library=both -Dlinux_kernel_headers=$SYSROOT/usr/include -Dheaders_only=false $MLIBC_BUILD_DIR $MLIBC_SRC_DIR
+    meson setup --cross-file $SPATH/cfg/cross-file.ini --prefix /usr -Ddefault_library=both -Dlinux_kernel_headers=$SYSROOT/usr/include -Dheaders_only=false $MLIBC_BUILD_DIR $MLIBC_SRC_DIR
 
     ninja -C $MLIBC_BUILD_DIR
     meson install -C $MLIBC_BUILD_DIR --destdir=$SYSROOT
@@ -847,7 +847,7 @@ function _cykusz_llvm {
 
     export CYKUSZ_SYSROOT_DIR=$SYSROOT
     export CYKUSZ_ROOT_DIR=$SPATH
-    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/CMakeToolchain-x86_64-cykusz.txt -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_TARGET_ARCH=x86_64 -DLLVM_DEFAULT_TARGET_TRIPLE=$TRIPLE -DLLVM_HOST_TRIPLE=$TRIPLE -Wno-dev $LLVM_SRC_DIR/llvm
+    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/cfg/CMakeToolchain-x86_64-cykusz.txt -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_TARGET_ARCH=x86_64 -DLLVM_DEFAULT_TARGET_TRIPLE=$TRIPLE -DLLVM_HOST_TRIPLE=$TRIPLE -Wno-dev $LLVM_SRC_DIR/llvm
 
     VERBOSE=1 make -j12 DESTDIR=$SYSROOT
     make DESTDIR=$SYSROOT install
@@ -864,7 +864,7 @@ function _cykusz_zstd {
 
     cd $ZSTD_CYKUSZ_BUILD_DIR
 
-    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/CMakeToolchain-x86_64-cykusz.txt -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release $ZSTD_SRC_DIR/build/cmake
+    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/cfg/CMakeToolchain-x86_64-cykusz.txt -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release $ZSTD_SRC_DIR/build/cmake
     make -j8
     DESTDIR=$SYSROOT make install
 
@@ -882,7 +882,7 @@ function _cykusz_zlib {
 
     export CYKUSZ_SYSROOT_DIR=$SYSROOT
     export CYKUSZ_ROOT_DIR=$SPATH
-    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/CMakeToolchain-x86_64-cykusz.txt  -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release $ZLIB_SRC_DIR
+    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/cfg/CMakeToolchain-x86_64-cykusz.txt  -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release $ZLIB_SRC_DIR
 
     VERBOSE=1 make -j12 DESTDIR=$SYSROOT
     make DESTDIR=$SYSROOT install
@@ -901,7 +901,7 @@ function _cykusz_libressl {
 
     export CYKUSZ_SYSROOT_DIR=$SYSROOT
     export CYKUSZ_ROOT_DIR=$SPATH
-    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/CMakeToolchain-x86_64-cykusz.txt -DBUILD_SHARED_LIBS=ON -DLIBRESSL_APPS=ON -DENABLE_NC=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release $LIBRESSL_SRC_DIR
+    cmake -DCMAKE_TOOLCHAIN_FILE=$SPATH/cfg/CMakeToolchain-x86_64-cykusz.txt -DBUILD_SHARED_LIBS=ON -DLIBRESSL_APPS=ON -DENABLE_NC=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release $LIBRESSL_SRC_DIR
 
     VERBOSE=1 make -j12 DESTDIR=$SYSROOT
     make DESTDIR=$SYSROOT install
@@ -917,7 +917,7 @@ function _cykusz_python {
     mkdir -p $PYTHON_CYKUSZ_BUILD_DIR
 
     cd $PYTHON_CYKUSZ_BUILD_DIR
-    export CONFIG_SITE=$SPATH/python-config-site
+    export CONFIG_SITE=$SPATH/cfg/python-config-site
     export PKG_CONFIG_SYSROOT_DIR=$SYSROOT
     export PKG_CONFIG_LIBDIR=$SYSROOT/usr/lib/pkgconfig:$SYSROOT/usr/share/pkgconfig
     $PYTHON_SRC_DIR/configure --with-build-python=python3.11 --host=$TRIPLE --build=x86_64-linux-gnu --prefix=/usr --enable-shared --disable-ipv6 --without-static-libpython --without-ensurepip
@@ -948,15 +948,15 @@ function _cykusz_readline {
 }
 
 function _cykusz_apps {
-	$TRIPLE-gcc $SPATH/test.c -o $BUILD_DIR/test
-	$TRIPLE-gcc $SPATH/stack.c -o $BUILD_DIR/stack
-	$TRIPLE-g++ $SPATH/hello.cpp -o $BUILD_DIR/hello
-	$TRIPLE-g++ $SPATH/test.cpp -o $BUILD_DIR/testcpp
-	$TRIPLE-gcc $SPATH/ttytest.c -o $BUILD_DIR/ttytest
-	$TRIPLE-gcc $SPATH/fork.c -o $BUILD_DIR/fork
-	$TRIPLE-gcc $SPATH/forktest.c -o $BUILD_DIR/forktest
-	$TRIPLE-gcc $SPATH/poweroff.c -o $BUILD_DIR/poweroff
-	$TRIPLE-gcc $SPATH/stat.c -o $BUILD_DIR/stat
+	$TRIPLE-gcc $SRC_DIR/cykusz_apps/test.c -o $BUILD_DIR/test
+	$TRIPLE-gcc $SRC_DIR/cykusz_apps/stack.c -o $BUILD_DIR/stack
+	$TRIPLE-g++ $SRC_DIR/cykusz_apps/hello.cpp -o $BUILD_DIR/hello
+	$TRIPLE-g++ $SRC_DIR/cykusz_apps/test.cpp -o $BUILD_DIR/testcpp
+	$TRIPLE-gcc $SRC_DIR/cykusz_apps/ttytest.c -o $BUILD_DIR/ttytest
+	$TRIPLE-gcc $SRC_DIR/cykusz_apps/fork.c -o $BUILD_DIR/fork
+	$TRIPLE-gcc $SRC_DIR/cykusz_apps/forktest.c -o $BUILD_DIR/forktest
+	$TRIPLE-gcc $SRC_DIR/cykusz_apps/poweroff.c -o $BUILD_DIR/poweroff
+	$TRIPLE-gcc $SRC_DIR/cykusz_apps/stat.c -o $BUILD_DIR/stat
 	_cykusz_nyancat
 }
 

sysroot/CMakeToolchain-x86_64-cykusz.txt → sysroot/cfg/CMakeToolchain-x86_64-cykusz.txt

@@ -1,4 +1,4 @@
-list(APPEND CMAKE_MODULE_PATH "$ENV{CYKUSZ_ROOT_DIR}/cmake/Modules")
+list(APPEND CMAKE_MODULE_PATH "$ENV{CYKUSZ_ROOT_DIR}/cfg/cmake/Modules")
 
 set(CMAKE_SYSTEM_NAME cykusz)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)

sysroot/make_docker_image.sh

@@ -3,4 +3,4 @@
 SPATH=$(dirname $(readlink -f "$0"))
 CYKUSZ_DIR=$(realpath $SPATH/..)
 
-docker buildx build -t cykusz-build $CYKUSZ_DIR/sysroot/docker
+docker buildx build -t cykusz-build $CYKUSZ_DIR/sysroot/cfg/docker