diff options
author | Marvin Borner | 2020-04-02 13:01:08 +0200 |
---|---|---|
committer | Marvin Borner | 2020-04-02 13:01:08 +0200 |
commit | f7d4c8891e5ef64d13567845b2bc02f31152c323 (patch) | |
tree | 54f6fa103260a64f010b6d0e01255dd4f4e89aab /src/kernel/fs | |
parent | ce13b28b90e8f7d8083658e083831c6528847099 (diff) |
Small fixes in the run executable
The run script is now able to run from any location && exits when the
installation test failed
Diffstat (limited to 'src/kernel/fs')
-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 |
3 files changed, 5 insertions, 7 deletions
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 |