mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:47:35 +00:00
LibC+Kernel: Switch off_t to 64 bits
This commit is contained in:
parent
b05b4d4b24
commit
7a079f7780
7 changed files with 23 additions and 13 deletions
|
@ -244,7 +244,7 @@ struct SC_mmap_params {
|
|||
int32_t prot;
|
||||
int32_t flags;
|
||||
int32_t fd;
|
||||
ssize_t offset;
|
||||
int64_t offset;
|
||||
StringArgument name;
|
||||
};
|
||||
|
||||
|
|
|
@ -276,7 +276,6 @@ public:
|
|||
KResultOr<int> sys$dump_backtrace();
|
||||
KResultOr<pid_t> sys$gettid();
|
||||
KResultOr<int> sys$donate(pid_t tid);
|
||||
KResultOr<int> sys$ftruncate(int fd, off_t);
|
||||
KResultOr<pid_t> sys$setsid();
|
||||
KResultOr<pid_t> sys$getsid(pid_t);
|
||||
KResultOr<int> sys$setpgid(pid_t pid, pid_t pgid);
|
||||
|
@ -299,7 +298,8 @@ public:
|
|||
KResultOr<ssize_t> sys$writev(int fd, Userspace<const struct iovec*> iov, int iov_count);
|
||||
KResultOr<int> sys$fstat(int fd, Userspace<stat*>);
|
||||
KResultOr<int> sys$stat(Userspace<const Syscall::SC_stat_params*>);
|
||||
KResultOr<int> sys$lseek(int fd, off_t, int whence);
|
||||
KResultOr<int> sys$lseek(int fd, Userspace<off_t*>, int whence);
|
||||
KResultOr<int> sys$ftruncate(int fd, Userspace<off_t*>);
|
||||
KResultOr<int> sys$kill(pid_t pid_or_pgid, int sig);
|
||||
[[noreturn]] void sys$exit(int status);
|
||||
KResultOr<int> sys$sigreturn(RegisterState& registers);
|
||||
|
|
|
@ -29,9 +29,12 @@
|
|||
|
||||
namespace Kernel {
|
||||
|
||||
KResultOr<int> Process::sys$ftruncate(int fd, off_t length)
|
||||
KResultOr<int> Process::sys$ftruncate(int fd, Userspace<off_t*> userspace_length)
|
||||
{
|
||||
REQUIRE_PROMISE(stdio);
|
||||
off_t length;
|
||||
if (!copy_from_user(&length, userspace_length))
|
||||
return EFAULT;
|
||||
if (length < 0)
|
||||
return EINVAL;
|
||||
auto description = file_description(fd);
|
||||
|
|
|
@ -29,13 +29,22 @@
|
|||
|
||||
namespace Kernel {
|
||||
|
||||
KResultOr<int> Process::sys$lseek(int fd, off_t offset, int whence)
|
||||
KResultOr<int> Process::sys$lseek(int fd, Userspace<off_t*> userspace_offset, int whence)
|
||||
{
|
||||
REQUIRE_PROMISE(stdio);
|
||||
auto description = file_description(fd);
|
||||
if (!description)
|
||||
return EBADF;
|
||||
return description->seek(offset, whence);
|
||||
off_t offset;
|
||||
if (!copy_from_user(&offset, userspace_offset))
|
||||
return EFAULT;
|
||||
offset = description->seek(offset, whence);
|
||||
if (!copy_to_user(userspace_offset, &offset))
|
||||
return EFAULT;
|
||||
if (offset < 0)
|
||||
return offset;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -424,9 +424,7 @@ struct sigaction {
|
|||
#define CLD_STOPPED 4
|
||||
#define CLD_CONTINUED 5
|
||||
|
||||
#define OFF_T_MAX 2147483647
|
||||
|
||||
typedef ssize_t off_t;
|
||||
typedef i64 off_t;
|
||||
typedef i64 time_t;
|
||||
|
||||
struct utimbuf {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue