mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 22:07:34 +00:00
Kernel: Rename Syscall::SyscallString => Syscall::StringArgument
This commit is contained in:
parent
0695ff8282
commit
416c7ac2b5
3 changed files with 8 additions and 8 deletions
|
@ -932,9 +932,9 @@ int Process::sys$execve(const Syscall::SC_execve_params* user_params)
|
|||
return true;
|
||||
if (!validate_read_typed(list.strings, list.length))
|
||||
return false;
|
||||
Vector<Syscall::SyscallString, 32> strings;
|
||||
Vector<Syscall::StringArgument, 32> strings;
|
||||
strings.resize(list.length);
|
||||
copy_from_user(strings.data(), list.strings, list.length * sizeof(Syscall::SyscallString));
|
||||
copy_from_user(strings.data(), list.strings, list.length * sizeof(Syscall::StringArgument));
|
||||
for (size_t i = 0; i < list.length; ++i) {
|
||||
if (!validate_read(strings[i].characters, strings[i].length))
|
||||
return false;
|
||||
|
|
|
@ -300,7 +300,7 @@ struct SC_set_mmap_name_params {
|
|||
size_t name_length;
|
||||
};
|
||||
|
||||
struct SyscallString {
|
||||
struct StringArgument {
|
||||
const char* characters { nullptr };
|
||||
size_t length { 0 };
|
||||
};
|
||||
|
@ -312,18 +312,18 @@ struct MutableBufferArgument {
|
|||
};
|
||||
|
||||
struct SyscallStringList {
|
||||
SyscallString* strings { nullptr };
|
||||
StringArgument* strings { nullptr };
|
||||
size_t length { 0 };
|
||||
};
|
||||
|
||||
struct SC_execve_params {
|
||||
SyscallString path;
|
||||
StringArgument path;
|
||||
SyscallStringList arguments;
|
||||
SyscallStringList environment;
|
||||
};
|
||||
|
||||
struct SC_readlink_params {
|
||||
SyscallString path;
|
||||
StringArgument path;
|
||||
MutableBufferArgument<char, size_t> buffer;
|
||||
};
|
||||
|
||||
|
|
|
@ -67,8 +67,8 @@ int execve(const char* filename, char* const argv[], char* const envp[])
|
|||
};
|
||||
|
||||
Syscall::SC_execve_params params;
|
||||
params.arguments.strings = (Syscall::SyscallString*)alloca(arg_count * sizeof(Syscall::SyscallString));
|
||||
params.environment.strings = (Syscall::SyscallString*)alloca(env_count * sizeof(Syscall::SyscallString));
|
||||
params.arguments.strings = (Syscall::StringArgument*)alloca(arg_count * sizeof(Syscall::StringArgument));
|
||||
params.environment.strings = (Syscall::StringArgument*)alloca(env_count * sizeof(Syscall::StringArgument));
|
||||
|
||||
params.path = { filename, strlen(filename) };
|
||||
copy_strings(argv, arg_count, params.arguments);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue