diff --git a/kernel/include/sortix/syscallnum.h b/kernel/include/sortix/syscallnum.h index 9fdcd86e..3a862f54 100644 --- a/kernel/include/sortix/syscallnum.h +++ b/kernel/include/sortix/syscallnum.h @@ -34,7 +34,7 @@ #define SYSCALL_CHANGE_FRAME 6 #define SYSCALL_DELETE_FRAME 7 #define SYSCALL_SET_FREQUENCY 9 -#define SYSCALL_EXEC 10 +#define SYSCALL_EXECVE 10 #define SYSCALL_PRINT_PATH_FILES 11 #define SYSCALL_GETPID 13 #define SYSCALL_GETPPID 14 @@ -57,8 +57,8 @@ #define SYSCALL_ISATTY 33 #define SYSCALL_UPTIME 34 #define SYSCALL_SBRK 35 -#define SYSCALL_SEEK 36 -#define SYSCALL_GET_PAGE_SIZE 37 +#define SYSCALL_LSEEK 36 +#define SYSCALL_GETPAGESIZE 37 #define SYSCALL_MKDIR 38 #define SYSCALL_RMDIR 39 #define SYSCALL_TRUNCATE 40 diff --git a/kernel/io.cpp b/kernel/io.cpp index e9159ac5..45275088 100644 --- a/kernel/io.cpp +++ b/kernel/io.cpp @@ -105,7 +105,7 @@ static ssize_t sys_pread(int fd, void* buffer, size_t count, off_t off) return ret; } -static off_t sys_seek(int fd, off_t offset, int whence) +static off_t sys_lseek(int fd, off_t offset, int whence) { Ref desc = CurrentProcess()->GetDescriptor(fd); if ( !desc ) @@ -1070,6 +1070,7 @@ void Init() Syscall::Register(SYSCALL_LINKAT, (void*) sys_linkat); Syscall::Register(SYSCALL_LINK, (void*) sys_link); Syscall::Register(SYSCALL_LISTEN, (void*) sys_listen); + Syscall::Register(SYSCALL_LSEEK, (void*) sys_lseek); Syscall::Register(SYSCALL_MKDIRAT, (void*) sys_mkdirat); Syscall::Register(SYSCALL_MKDIR, (void*) sys_mkdir); Syscall::Register(SYSCALL_MKPARTITION, (void*) sys_mkpartition); @@ -1086,7 +1087,6 @@ void Init() Syscall::Register(SYSCALL_RECV, (void*) sys_recv); Syscall::Register(SYSCALL_RENAMEAT, (void*) sys_renameat); Syscall::Register(SYSCALL_RMDIR, (void*) sys_rmdir); - Syscall::Register(SYSCALL_SEEK, (void*) sys_seek); Syscall::Register(SYSCALL_SEND, (void*) sys_send); Syscall::Register(SYSCALL_SETTERMMODE, (void*) sys_settermmode); Syscall::Register(SYSCALL_STAT, (void*) sys_stat); diff --git a/kernel/process.cpp b/kernel/process.cpp index fba7718f..87ad1bce 100644 --- a/kernel/process.cpp +++ b/kernel/process.cpp @@ -1256,9 +1256,9 @@ static mode_t sys_getumask(void) void Process::Init() { - Syscall::Register(SYSCALL_EXEC, (void*) sys_execve); + Syscall::Register(SYSCALL_EXECVE, (void*) sys_execve); Syscall::Register(SYSCALL_EXIT, (void*) sys_exit); - Syscall::Register(SYSCALL_GET_PAGE_SIZE, (void*) sys_getpagesize); + Syscall::Register(SYSCALL_GETPAGESIZE, (void*) sys_getpagesize); Syscall::Register(SYSCALL_GETPGID, (void*) sys_getpgid); Syscall::Register(SYSCALL_GETPID, (void*) sys_getpid); Syscall::Register(SYSCALL_GETPPID, (void*) sys_getppid); diff --git a/libc/unistd/execve.cpp b/libc/unistd/execve.cpp index 49759061..530c626e 100644 --- a/libc/unistd/execve.cpp +++ b/libc/unistd/execve.cpp @@ -25,7 +25,7 @@ #include #include -DEFN_SYSCALL3(int, sys_execve, SYSCALL_EXEC, const char*, char* const*, char* const*); +DEFN_SYSCALL3(int, sys_execve, SYSCALL_EXECVE, const char*, char* const*, char* const*); extern "C" int execve(const char* pathname, char* const* argv, char* const* envp) diff --git a/libc/unistd/getpagesize.cpp b/libc/unistd/getpagesize.cpp index 32203fe6..f6e9a390 100644 --- a/libc/unistd/getpagesize.cpp +++ b/libc/unistd/getpagesize.cpp @@ -25,7 +25,7 @@ #include #include -DEFN_SYSCALL0(size_t, sys_getpagesize, SYSCALL_GET_PAGE_SIZE); +DEFN_SYSCALL0(size_t, sys_getpagesize, SYSCALL_GETPAGESIZE); extern "C" size_t getpagesize(void) { diff --git a/libc/unistd/lseek.cpp b/libc/unistd/lseek.cpp index 0e2a63ac..196fab47 100644 --- a/libc/unistd/lseek.cpp +++ b/libc/unistd/lseek.cpp @@ -25,7 +25,7 @@ #include #include -DEFN_SYSCALL3(off_t, sys_seek, SYSCALL_SEEK, int, off_t, int); +DEFN_SYSCALL3(off_t, sys_seek, SYSCALL_LSEEK, int, off_t, int); extern "C" off_t lseek(int fd, off_t offset, int whence) {