From d9e518c6f7dc0ad464495b586d1b8e115d54d41a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 8 Nov 2014 20:44:44 +0100
Subject: use the same code to detect quiet setting in all tools

Git-Dch: Ignore
---
 cmdline/apt-mark.cc | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'cmdline/apt-mark.cc')

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 487f3d8a1..2702dbbd3 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -22,6 +22,7 @@
 #include <apt-pkg/pkgcache.h>
 
 #include <apt-private/private-cmndline.h>
+#include <apt-private/private-output.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -41,10 +42,6 @@
 									/*}}}*/
 using namespace std;
 
-ostream c0out(0);
-ostream c1out(0);
-ostream c2out(0);
-ofstream devnull("/dev/null");
 /* DoAuto - mark packages as automatically/manually installed		{{{*/
 static bool DoAuto(CommandLine &CmdL)
 {
@@ -444,18 +441,7 @@ int main(int argc,const char *argv[])					/*{{{*/
    CommandLine CmdL;
    ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
 
-   // Deal with stdout not being a tty
-   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
-
-   // Setup the output streams
-   c0out.rdbuf(cout.rdbuf());
-   c1out.rdbuf(cout.rdbuf());
-   c2out.rdbuf(cout.rdbuf());
-   if (_config->FindI("quiet",0) > 0)
-      c0out.rdbuf(devnull.rdbuf());
-   if (_config->FindI("quiet",0) > 1)
-      c1out.rdbuf(devnull.rdbuf());
+   InitOutput();
 
    // Match the operation
    CmdL.DispatchArg(Cmds);
-- 
cgit v1.2.3