RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:48:11 +00:00
Code Issues Activity Actions

Implement argc/argv support for spawned tasks.

Browse source 
Celebrate the new functionality with a simple /bin/cat implementation. :^)
This commit is contained in:
Andreas Kling 2018-10-26 11:16:56 +02:00
parent 53abfa7ea1
commit df87dda63c
13 changed files with 105 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Kernel/Task.cpp
View file

@ -185,18 +185,19 @@ int Task::sys$gethostname(char* buffer, size_t size)
if (size < (hn.length() + 1))
return -ENAMETOOLONG;
memcpy(buffer, hn.characters(), size);
return 0;
}
int Task::sys$spawn(const char* path)
int Task::sys$spawn(const char* path, const char** args)
{
int error = 0;
auto* child = Task::createUserTask(path, m_uid, m_gid, m_pid, error);
auto* child = Task::createUserTask(path, m_uid, m_gid, m_pid, error, args);
if (child)
return child->pid();
return error;
}
Task* Task::createUserTask(const String& path, uid_t uid, gid_t gid, pid_t parentPID, int& error)
Task* Task::createUserTask(const String& path, uid_t uid, gid_t gid, pid_t parentPID, int& error, const char** args)
{
auto parts = path.split('/');
if (parts.isEmpty()) {
@ -216,9 +217,20 @@ Task* Task::createUserTask(const String& path, uid_t uid, gid_t gid, pid_t paren
return nullptr;
}
Vector<String> taskArguments;
if (args) {
for (size_t i = 0; args[i]; ++i) {
taskArguments.append(args[i]);
}
} else {
taskArguments.append(parts.last());
}
InterruptDisabler disabler; // FIXME: Get rid of this, jesus christ. This "critical" section is HUGE.
Task* t = new Task(parts.takeLast(), uid, gid, parentPID, Ring3);
t->m_arguments = move(taskArguments);
ExecSpace space;
space.hookableAlloc = [&] (const String& name, size_t size) {
if (!size)
@ -257,6 +269,25 @@ Task* Task::createUserTask(const String& path, uid_t uid, gid_t gid, pid_t paren
return t;
}
int Task::sys$get_arguments(int* argc, char*** argv)
{
auto* region = allocateRegion(4096, "argv");
if (!region)
return -ENOMEM;
MemoryManager::the().mapRegion(*this, *region);
char* argpage = (char*)region->linearAddress.get();
*argc = m_arguments.size();
*argv = (char**)argpage;
char* bufptr = argpage + (sizeof(char*) * m_arguments.size());
for (size_t i = 0; i < m_arguments.size(); ++i) {
(*argv)[i] = bufptr;
memcpy(bufptr, m_arguments[i].characters(), m_arguments[i].length());
bufptr += m_arguments[i].length();
*(bufptr++) = '\0';
}
return 0;
}
Task* Task::createKernelTask(void (*e)(), String&& name)
{
Task* task = new Task(move(name), (uid_t)0, (gid_t)0, (pid_t)0, Ring0);