centralize 'show' implementation of apt and apt-cache

[apt.git] / apt-private / private-main.cc

diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 1fdf3f0be38823814e9abb9c4b1af3c6eee45864..3886c7df65474a2ac394ca66d07e14790ddda7c4 100644 (file)
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -1,21 +1,36 @@
+#include <config.h>
 
-#include<unistd.h>
-#include<cstring>
-
+#include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
-#include "private-main.h"
+
+#include <apt-private/private-main.h>
+
+#include <iostream>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
 
 #include <apti18n.h>
 
+
+void InitSignals()
+{
+   // Setup the signals
+   signal(SIGPIPE,SIG_IGN);
+}
+
+
 void CheckSimulateMode(CommandLine &CmdL)
 {
-   // simulate user-friendly if apt-get has no root privileges
-   if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true &&
+   // disable locking in simulation, but show the message only for users
+   // as root hasn't the same problems like unreadable files which can heavily
+   // distort the simulation.
+   if (_config->FindB("APT::Get::Simulate") == true &&
        (CmdL.FileSize() == 0 ||
         (strcmp(CmdL.FileList[0], "source") != 0 && strcmp(CmdL.FileList[0], "download") != 0 &&
          strcmp(CmdL.FileList[0], "changelog") != 0)))
    {
-      if (_config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
+      if (getuid() != 0 && _config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
          std::cout << _("NOTE: This is only a simulation!\n"
            "      apt-get needs root privileges for real execution.\n"
            "      Keep also in mind that locking is deactivated,\n"