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

Shell: Move printing job status into a Job::print_status() helper

Browse source 
This is only used by the "jobs" builtin right now, but more soon.
This commit is contained in:
Andreas Kling 2020-08-06 15:09:25 +02:00
parent d9aecc8e08
commit 22dd5a7021
4 changed files with 86 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Shell/Builtin.cpp
View file

@ -429,55 +429,17 @@ int Shell::builtin_jobs(int argc, const char** argv)
if (!parser.parse(argc, const_cast<char**>(argv), false))
return 1;
enum {
Basic,
OnlyPID,
ListAll,
} mode { Basic };
Job::PrintStatusMode mode = Job::PrintStatusMode::Basic;
if (show_pid)
mode = OnlyPID;
mode = Job::PrintStatusMode::OnlyPID;
if (list)
mode = ListAll;
mode = Job::PrintStatusMode::ListAll;
for (auto& job : jobs) {
auto pid = job.value->pid();
int wstatus;
auto rc = waitpid(pid, &wstatus, WNOHANG);
if (rc == -1) {
perror("waitpid");
for (auto& it : jobs) {
if (!it.value->print_status(mode))
return 1;
}
auto status = "running";
if (rc != 0) {
if (WIFEXITED(wstatus))
status = "exited";
if (WIFSTOPPED(wstatus))
status = "stopped";
if (WIFSIGNALED(wstatus))
status = "signaled";
}
char background_indicator = '-';
if (job.value->is_running_in_background())
background_indicator = '+';
switch (mode) {
case Basic:
printf("[%" PRIu64 "] %c %s %s\n", job.value->job_id(), background_indicator, status, job.value->cmd().characters());
break;
case OnlyPID:
printf("[%" PRIu64 "] %c %d %s %s\n", job.value->job_id(), background_indicator, pid, status, job.value->cmd().characters());
break;
case ListAll:
printf("[%" PRIu64 "] %c %d %d %s %s\n", job.value->job_id(), background_indicator, pid, job.value->pgid(), status, job.value->cmd().characters());
break;
}
}
return 0;