NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Handle newlines better in nix processes

Browse source
This commit is contained in:
Matthew Bauer 2020-07-11 21:38:42 +00:00
parent bd8152e44f
commit 5f6dbc16f9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix/processes.cc
View file

@ -158,11 +158,11 @@ struct CmdProcesses : StoreCommand
if (st.st_uid != geteuid() && geteuid() != 0)
throw Error("you don't have permissions to see the userpool locks");
auto dirs = readDirectory(userPoolDir);
for (auto i = dirs.begin(); i != dirs.end(); i++) {
bool isFirst = true;
for (auto & dir : readDirectory(userPoolDir)) {
int uid;
try {
uid = std::stoi(i->name);
uid = std::stoi(dir.name);
} catch (const std::invalid_argument& e) {
continue;
}
@ -181,8 +181,10 @@ struct CmdProcesses : StoreCommand
if (pid == -1)
continue;
if (i != dirs.begin())
if (!isFirst)
std::cout << std::endl;
else
isFirst = false;
struct passwd * pw = getpwuid(uid);
if (!pw)