RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 17:55:08 +00:00
Code Issues Activity Actions

ps: Port to LibMain :^)

Browse source
This commit is contained in:
Andreas Kling 2021-11-23 15:42:17 +01:00
parent 120168203e
commit e6579e7029
2 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -88,6 +88,7 @@ target_link_libraries(pgrep LibRegex)
target_link_libraries(pls LibCrypt) target_link_libraries(pls LibCrypt)
target_link_libraries(pmap LibMain) target_link_libraries(pmap LibMain)
target_link_libraries(pro LibProtocol) target_link_libraries(pro LibProtocol)
target_link_libraries(ps LibMain)
target_link_libraries(run-tests LibRegex) target_link_libraries(run-tests LibRegex)
target_link_libraries(shot LibGUI) target_link_libraries(shot LibGUI)
target_link_libraries(sql LibLine LibSQL LibIPC) target_link_libraries(sql LibLine LibSQL LibIPC)

43
Userland/Utilities/ps.cpp
View file

@ -7,34 +7,19 @@
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/ProcessStatisticsReader.h> #include <LibCore/ProcessStatisticsReader.h>
#include <stdio.h> #include <LibCore/System.h>
#include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio rpath tty", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath tty", nullptr));
perror("pledge");
return 1;
}
String this_tty = ttyname(STDIN_FILENO); String this_tty = ttyname(STDIN_FILENO);
if (pledge("stdio rpath", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath", nullptr));
perror("pledge"); TRY(Core::System::unveil("/proc/all", "r"));
return 1; TRY(Core::System::unveil("/etc/passwd", "r"));
} TRY(Core::System::unveil(nullptr, nullptr));
if (unveil("/proc/all", "r") < 0) {
perror("unveil");
return 1;
}
if (unveil("/etc/passwd", "r") < 0) {
perror("unveil");
return 1;
}
unveil(nullptr, nullptr);
enum class Alignment { enum class Alignment {
Left, Left,
@ -56,7 +41,7 @@ int main(int argc, char** argv)
args_parser.add_option(every_process_flag, "Show every process", nullptr, 'e'); args_parser.add_option(every_process_flag, "Show every process", nullptr, 'e');
args_parser.add_option(full_format_flag, "Full format", nullptr, 'f'); args_parser.add_option(full_format_flag, "Full format", nullptr, 'f');
args_parser.add_option(pid_list, "A comma-separated list of PIDs. Only processes matching those PIDs will be selected", nullptr, 'q', "pid-list"); args_parser.add_option(pid_list, "A comma-separated list of PIDs. Only processes matching those PIDs will be selected", nullptr, 'q', "pid-list");
args_parser.parse(argc, argv); args_parser.parse(arguments);
Vector<Column> columns; Vector<Column> columns;
@ -124,12 +109,12 @@ int main(int argc, char** argv)
} }
Vector<Vector<String>> rows; Vector<Vector<String>> rows;
rows.ensure_capacity(1 + processes.size()); TRY(rows.try_ensure_capacity(1 + processes.size()));
Vector<String> header; Vector<String> header;
header.ensure_capacity(columns.size()); TRY(header.try_ensure_capacity(columns.size()));
for (auto& column : columns) for (auto& column : columns)
header.append(column.title); header.unchecked_append(column.title);
rows.append(move(header)); rows.append(move(header));
for (auto const& process : processes) { for (auto const& process : processes) {
@ -146,7 +131,7 @@ int main(int argc, char** argv)
auto* state = process.threads.is_empty() ? "Zombie" : process.threads.first().state.characters(); auto* state = process.threads.is_empty() ? "Zombie" : process.threads.first().state.characters();
Vector<String> row; Vector<String> row;
row.resize(columns.size()); TRY(row.try_resize(columns.size()));
if (uid_column != -1) if (uid_column != -1)
row[uid_column] = process.username; row[uid_column] = process.username;
@ -165,7 +150,7 @@ int main(int argc, char** argv)
if (cmd_column != -1) if (cmd_column != -1)
row[cmd_column] = process.name; row[cmd_column] = process.name;
rows.append(move(row)); TRY(rows.try_append(move(row)));
} }
for (size_t i = 0; i < columns.size(); i++) { for (size_t i = 0; i < columns.size(); i++) {