DropPrivs: Move the re-set uid/gid thing to the end of the function

[apt.git] / cmdline / apt.cc

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 61d5d938aba4c7267bf2a1218a1f290801ed26d8..2cfdf8e8e4e046da431f911bc14fb1ee3567cddf 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -11,39 +11,12 @@
 // Include Files                                                       /*{{{*/
 #include<config.h>
 
-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <iomanip>
-#include <algorithm>
-
-
+#include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheset.h>
 #include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
-#include <apt-pkg/hashes.h>
-
-#include <apti18n.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
 
 #include <apt-private/private-list.h>
 #include <apt-private/private-search.h>
@@ -55,13 +28,16 @@
 #include <apt-private/private-upgrade.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
-#include <apt-private/private-utils.h>
 #include <apt-private/private-sources.h>
-                                                                       /*}}}*/
 
+#include <unistd.h>
+#include <iostream>
+#include <vector>
 
+#include <apti18n.h>
+                                                                       /*}}}*/
 
-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
@@ -81,7 +57,8 @@ bool ShowHelp(CommandLine &CmdL)
       " install - install packages\n"
       " remove  - remove packages\n"
       "\n"
-      " upgrade - upgrade the systems packages\n"
+      " upgrade - upgrade the system by installing/upgrading packages\n"
+      " full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
       "\n"
       " edit-sources - edit the source information file\n"
        );
@@ -89,28 +66,29 @@ bool ShowHelp(CommandLine &CmdL)
    return true;
 }
 
-// figure out what kind of upgrade the user wants
-bool DoAptUpgrade(CommandLine &CmdL)
-{
-   if (_config->FindB("Apt::Cmd::Dist-Upgrade"))
-      return DoDistUpgrade(CmdL);
-   else
-      return DoUpgradeWithAllowNewPackages(CmdL);
-}
-
 int main(int argc, const char *argv[])                                 /*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"list",&List},
+   CommandLine::Dispatch Cmds[] = {
+                                   // query
+                                   {"list",&DoList},
                                    {"search", &FullTextSearch},
                                    {"show", &APT::Cmd::ShowPackage},
-                                   // needs root
+
+                                   // package stuff
                                    {"install",&DoInstall},
                                    {"remove", &DoInstall},
                                    {"purge", &DoInstall},
+
+                                   // system wide stuff
                                    {"update",&DoUpdate},
-                                   {"upgrade",&DoAptUpgrade},
+                                   {"upgrade",&DoUpgrade},
+                                   {"full-upgrade",&DoDistUpgrade},
+                                   // for compat with muscle memory
+                                   {"dist-upgrade",&DoDistUpgrade},
+
                                    // misc
                                    {"edit-sources",&EditSources},
+
                                    // helper
                                    {"moo",&DoMoo},
                                    {"help",&ShowHelp},
@@ -118,6 +96,10 @@ int main(int argc, const char *argv[])                                      /*{{{*/
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
 
+   // Init the signals
+   InitSignals();
+
+   // Init the output
    InitOutput();
 
    // Set up gettext support
@@ -130,9 +112,11 @@ int main(int argc, const char *argv[])                                     /*{{{*/
         return 100;
     }
 
-   // FIXME: move into a new libprivate/private-install.cc:Install()
-   _config->Set("DPkgPM::Progress", "1");
-   _config->Set("Apt::Color", "1");
+    // some different defaults
+   _config->CndSet("DPkg::Progress-Fancy", "1");
+   _config->CndSet("Apt::Color", "1");
+   _config->CndSet("APT::Get::Upgrade-Allow-New", true);
+   _config->CndSet("APT::Cmd::Show-Update-Stats", true);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args.data(), _config);
@@ -153,8 +137,6 @@ int main(int argc, const char *argv[])                                      /*{{{*/
                 << std::endl
                 << std::endl;
    }
-   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
 
    // See if the help should be shown
    if (_config->FindB("help") == true ||