diff options
| -rwxr-xr-x | run | 4 | ||||
| -rw-r--r-- | src/kernel/fs/elf.c | 8 | ||||
| -rw-r--r-- | src/kernel/fs/load.c | 2 | ||||
| -rw-r--r-- | src/kernel/fs/load.h | 2 | ||||
| -rw-r--r-- | src/kernel/kernel.c | 2 | ||||
| -rw-r--r-- | src/userspace/linker.ld | 2 |
6 files changed, 10 insertions, 10 deletions
@@ -1,5 +1,7 @@ #!/usr/bin/env sh +cd "$(dirname "$0")" || exit + mode="${1}" network="rtl8139" @@ -144,7 +146,7 @@ make_image() { end=$(date +%s.%N) cat install.log printf "[LOG END]\n\n" - tail install.log | grep -q "Installation successful!" && echo Booted and installed within "$(echo "$end - $start" | bc -l)" seconds || echo Installation failed! + tail install.log | grep -q "Installation successful!" && echo Booted and installed within "$(echo "$end - $start" | bc -l)" seconds || echo Installation failed! && exit rm install.log } diff --git a/src/kernel/fs/elf.c b/src/kernel/fs/elf.c index 62c4e8d..9af3636 100644 --- a/src/kernel/fs/elf.c +++ b/src/kernel/fs/elf.c @@ -40,14 +40,12 @@ uint32_t load_elf(char *elf_data) v_begin = p_entry->vaddr; v_end = p_entry->vaddr + p_entry->memsz; if (v_begin < USER_OFFSET) { - warn("load_elf(): can't load executable below %x\n", - USER_OFFSET); + warn("load_elf(): can't load executable below %x\n", USER_OFFSET); return 0; } if (v_end > USER_STACK) { - warn("load_elf(): can't load executable above %x\n", - USER_STACK); + warn("load_elf(): can't load executable above %x\n", USER_STACK); return 0; } @@ -65,4 +63,4 @@ uint32_t load_elf(char *elf_data) } return hdr->entry; -} +}
\ No newline at end of file diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c index c7bbb3d..b717e4f 100644 --- a/src/kernel/fs/load.c +++ b/src/kernel/fs/load.c @@ -35,4 +35,4 @@ void load_binaries() kfree(user_e); } vga_log("Successfully loaded binaries"); -} +}
\ No newline at end of file diff --git a/src/kernel/fs/load.h b/src/kernel/fs/load.h index 2adefee..3730b0b 100644 --- a/src/kernel/fs/load.h +++ b/src/kernel/fs/load.h @@ -16,4 +16,4 @@ struct font { void load_binaries(); -#endif +#endif
\ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index e1822d8..80439bc 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -65,4 +65,4 @@ void kernel_main(uint32_t initial_stack) panic("This should NOT happen!"); // asm ("div %0" :: "r"(0)); // Exception testing x/0 -} +}
\ No newline at end of file diff --git a/src/userspace/linker.ld b/src/userspace/linker.ld index 7c2941f..152e0bf 100644 --- a/src/userspace/linker.ld +++ b/src/userspace/linker.ld @@ -16,4 +16,4 @@ SECTIONS { *(.bss) . = ALIGN(4096); } -} +}
\ No newline at end of file |