Stub out RunPager definition rather than call sites

NixOS · Mar 26, 2024 · c0b3efa · c0b3efa
1 parent 0c364f4
commit c0b3efa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc
@@ -576,9 +576,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
             subs.push_front(state->store);
 
             bool foundLog = false;
-#ifndef __WIN32
             RunPager pager;
-#endif
             for (auto & sub : subs) {
                 auto * logSubP = dynamic_cast<LogStore *>(&*sub);
                 if (!logSubP) {

diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
@@ -365,7 +365,6 @@ int handleExceptions(const std::string & programName, std::function<void()> fun)
     return 0;
 }
 
-#ifndef __WIN32
 RunPager::RunPager()
 {
     if (!isatty(STDOUT_FILENO)) return;
@@ -375,6 +374,7 @@ RunPager::RunPager()
 
     stopProgressBar();
 
+#ifndef __WIN32
     Pipe toPager;
     toPager.create();
 
@@ -396,11 +396,13 @@ RunPager::RunPager()
     std_out = fcntl(STDOUT_FILENO, F_DUPFD_CLOEXEC, 0);
     if (dup2(toPager.writeSide.get(), STDOUT_FILENO) == -1)
         throw SysError("dupping standard output");
+#endif
 }
 
 
 RunPager::~RunPager()
 {
+#ifndef __WIN32
     try {
         if (pid != -1) {
             std::cout.flush();
@@ -410,8 +412,8 @@ RunPager::~RunPager()
     } catch (...) {
         ignoreException();
     }
-}
 #endif
+}
 
 
 PrintFreed::~PrintFreed()

diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
@@ -84,18 +84,18 @@ void showManPage(const std::string & name);
  * terminal and $PAGER is set. Standard output is redirected to the
  * pager.
  */
-#ifndef __WIN32
 class RunPager
 {
 public:
     RunPager();
     ~RunPager();
 
 private:
+#ifndef __WIN32
     Pid pid;
     int std_out;
-};
 #endif
+};
 
 extern volatile ::sig_atomic_t blockInt;
 

diff --git a/src/nix/log.cc b/src/nix/log.cc
@@ -50,9 +50,7 @@ struct CmdLog : InstallableCommand
         }, b.path.raw());
         auto path = resolveDerivedPath(*store, *oneUp);
 
-#ifndef __WIN32
         RunPager pager;
-#endif
         for (auto & sub : subs) {
             auto * logSubP = dynamic_cast<LogStore *>(&*sub);
             if (!logSubP) {

diff --git a/src/nix/main.cc b/src/nix/main.cc
@@ -273,9 +273,7 @@ static void showHelp(std::vector<std::string> subcommand, NixArgs & toplevel)
 
     auto markdown = state.forceString(*attr->value, noPos, "while evaluating the lowdown help text");
 
-#ifndef __WIN32
     RunPager pager;
-#endif
     std::cout << renderMarkdownToTerminal(markdown) << "\n";
 }
 

diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc
@@ -291,9 +291,7 @@ struct CmdWhyDepends : SourceExprCommand, MixOperateOnOptions
             }
         };
 
-#ifndef __WIN32
         RunPager pager;
-#endif
         try {
             if (!precise) {
                 logger->cout("%s", store->printStorePath(graph.at(packagePath).path));