Skip to content

Commit

Permalink
Rename an identifier of ours called stdout
Browse files Browse the repository at this point in the history
This is a reserved identifier on NetBSD --- it is replaced by a macro on
that platform --- and so we cannot use it.
  • Loading branch information
Ericson2314 committed Sep 20, 2023
1 parent 0db251e commit 7f76d7f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/libmain/shared.cc
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,9 @@ RunPager::RunPager()
});

pid.setKillSignal(SIGINT);
stdout = fcntl(STDOUT_FILENO, F_DUPFD_CLOEXEC, 0);
std_out = fcntl(STDOUT_FILENO, F_DUPFD_CLOEXEC, 0);
if (dup2(toPager.writeSide.get(), STDOUT_FILENO) == -1)
throw SysError("dupping stdout");
throw SysError("dupping standard output");
}


Expand All @@ -390,7 +390,7 @@ RunPager::~RunPager()
try {
if (pid != -1) {
std::cout.flush();
dup2(stdout, STDOUT_FILENO);
dup2(std_out, STDOUT_FILENO);
pid.wait();
}
} catch (...) {
Expand Down
7 changes: 4 additions & 3 deletions src/libmain/shared.hh
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ struct LegacyArgs : public MixCommonArgs
void showManPage(const std::string & name);

/**
* The constructor of this class starts a pager if stdout is a
* terminal and $PAGER is set. Stdout is redirected to the pager.
* The constructor of this class starts a pager if standard output is a
* terminal and $PAGER is set. Standard output is redirected to the
* pager.
*/
class RunPager
{
Expand All @@ -96,7 +97,7 @@ public:

private:
Pid pid;
int stdout;
int std_out;
};

extern volatile ::sig_atomic_t blockInt;
Expand Down

0 comments on commit 7f76d7f

Please sign in to comment.