The entire concept of PendingError() is flawed :/.

[apt.git] / cmdline / apt-mark.cc

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 6080c7ea3549bf85bad84ea460bf12ea3033ca23..0cba31e703ce7b1aa3d47cb48130e80297ff7157 100644 (file)
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -24,6 +24,7 @@
 
 #include <apt-private/private-cmndline.h>
 #include <apt-private/private-output.h>
 
 #include <apt-private/private-cmndline.h>
 #include <apt-private/private-output.h>

+#include <apt-private/private-main.h>

 
 #include <errno.h>
 #include <fcntl.h>
 
 #include <errno.h>
 #include <fcntl.h>


@@ -47,9 +48,8 @@ using namespace std;
 static bool DoAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
 static bool DoAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;

-   pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgDepCache *DepCache = CacheFile.GetDepCache();
-   if (unlikely(Cache == NULL || DepCache == NULL))
+   pkgDepCache * const DepCache = CacheFile.GetDepCache();
+   if (unlikely(DepCache == nullptr))

       return false;
 
    APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1);
       return false;
 
    APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1);


@@ -94,9 +94,8 @@ static bool DoAuto(CommandLine &CmdL)
 static bool DoMarkAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
 static bool DoMarkAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;

-   pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgDepCache *DepCache = CacheFile.GetDepCache();
-   if (unlikely(Cache == NULL || DepCache == NULL))
+   pkgDepCache * const DepCache = CacheFile.GetDepCache();
+   if (unlikely(DepCache == nullptr))

       return false;
 
    APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1);
       return false;
 
    APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1);


@@ -131,9 +130,8 @@ static bool DoMarkAuto(CommandLine &CmdL)
 static bool ShowAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
 static bool ShowAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;

-   pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgDepCache *DepCache = CacheFile.GetDepCache();
-   if (unlikely(Cache == NULL || DepCache == NULL))
+   pkgDepCache * const DepCache = CacheFile.GetDepCache();
+   if (unlikely(DepCache == nullptr))

       return false;
 
    std::vector<string> packages;
       return false;
 
    std::vector<string> packages;


@@ -142,8 +140,8 @@ static bool ShowAuto(CommandLine &CmdL)
 
    if (CmdL.FileList[1] == 0)
    {
 
    if (CmdL.FileList[1] == 0)
    {

-      packages.reserve(Cache->HeaderP->PackageCount / 3);
-      for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)
+      packages.reserve(DepCache->Head().PackageCount / 3);
+      for (pkgCache::PkgIterator P = DepCache->PkgBegin(); P.end() == false; ++P)

         if (P->CurrentVer != 0 &&
             (((*DepCache)[P].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) == ShowAuto)
            packages.push_back(P.FullName(true));
         if (P->CurrentVer != 0 &&
             (((*DepCache)[P].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) == ShowAuto)
            packages.push_back(P.FullName(true));


@@ -171,8 +169,8 @@ static bool ShowAuto(CommandLine &CmdL)
 static bool DoSelection(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
 static bool DoSelection(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;

-   pkgCache *Cache = CacheFile.GetPkgCache();
-   if (unlikely(Cache == NULL))
+   pkgCache * const Cache = CacheFile.GetPkgCache();
+   if (unlikely(Cache == nullptr))

       return false;
 
    APT::VersionVector pkgset = APT::VersionVector::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::CacheSetHelper::INSTCAND);
       return false;
 
    APT::VersionVector pkgset = APT::VersionVector::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::CacheSetHelper::INSTCAND);


@@ -237,8 +235,8 @@ static bool DoSelection(CommandLine &CmdL)
 static bool ShowSelection(CommandLine &CmdL)                           /*{{{*/
 {
    pkgCacheFile CacheFile;
 static bool ShowSelection(CommandLine &CmdL)                           /*{{{*/
 {
    pkgCacheFile CacheFile;

-   pkgCache *Cache = CacheFile.GetPkgCache();
-   if (unlikely(Cache == NULL))
+   pkgCache * const Cache = CacheFile.GetPkgCache();
+   if (unlikely(Cache == nullptr))

       return false;
 
    pkgCache::State::PkgSelectedState selector;
       return false;
 
    pkgCache::State::PkgSelectedState selector;


@@ -279,84 +277,50 @@ static bool ShowSelection(CommandLine &CmdL)                              /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// ShowHelp - Show a help screen                                       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
 {

-   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
-   cout <<
+   std::cout <<

     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
       "\n"
       "apt-mark is a simple command line interface for marking packages\n"
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
       "\n"
       "apt-mark is a simple command line interface for marking packages\n"

-      "as manually or automatically installed. It can also list marks.\n"
-      "\n"
-      "Commands:\n"
-      "   auto - Mark the given packages as automatically installed\n"
-      "   manual - Mark the given packages as manually installed\n"
-      "   hold - Mark a package as held back\n"
-      "   unhold - Unset a package set as held back\n"
-      "   showauto - Print the list of automatically installed packages\n"
-      "   showmanual - Print the list of manually installed packages\n"
-      "   showhold - Print the list of package on hold\n"
-      "\n"
-      "Options:\n"
-      "  -h  This help text.\n"
-      "  -q  Loggable output - no progress indicator\n"
-      "  -qq No output except for errors\n"
-      "  -s  No-act. Just prints what would be done.\n"
-      "  -f  read/write auto/manual marking in the given file\n"
-      "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-      "See the apt-mark(8) and apt.conf(5) manual pages for more information.")
-      << std::endl;
+      "as manually or automatically installed. It can also be used to\n"
+      "manipulate the dpkg(1) selection states of packages, and to list\n"
+      "all packages with or without a certain marking.\n");

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/
+{
+   return {
+      {"auto",&DoAuto, _("Mark the given packages as automatically installed")},
+      {"manual",&DoAuto, _("Mark the given packages as manually installed")},
+      {"hold",&DoSelection, _("Mark a package as held back")},
+      {"unhold",&DoSelection, _("Unset a package set as held back")},
+      {"install",&DoSelection, nullptr},
+      {"remove",&DoSelection, nullptr}, // dpkg uses deinstall, but we use remove everywhere else
+      {"deinstall",&DoSelection, nullptr},
+      {"purge",&DoSelection, nullptr},
+      {"showauto",&ShowAuto, _("Print the list of automatically installed packages")},
+      {"showmanual",&ShowAuto, _("Print the list of manually installed packages")},
+      {"showhold",&ShowSelection, _("Print the list of package on hold")}, {"showholds",&ShowSelection, nullptr},
+      {"showinstall",&ShowSelection, nullptr}, {"showinstalls",&ShowSelection, nullptr},
+      {"showdeinstall",&ShowSelection, nullptr}, {"showdeinstalls",&ShowSelection, nullptr},
+      {"showremove",&ShowSelection, nullptr}, {"showremoves",&ShowSelection, nullptr},
+      {"showpurge",&ShowSelection, nullptr}, {"showpurges",&ShowSelection, nullptr},
+      // obsolete commands for compatibility
+      {"markauto", &DoMarkAuto, nullptr},
+      {"unmarkauto", &DoMarkAuto, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
+}
+                                                                       /*}}}*/

 int main(int argc,const char *argv[])                                  /*{{{*/
 {
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
-                                  {"auto",&DoAuto},
-                                  {"manual",&DoAuto},
-                                  {"hold",&DoSelection},
-                                  {"unhold",&DoSelection},
-                                  {"install",&DoSelection},
-                                  {"remove",&DoSelection}, // dpkg uses deinstall, but we use remove everywhere else
-                                  {"deinstall",&DoSelection},
-                                  {"purge",&DoSelection},
-                                  {"showauto",&ShowAuto},
-                                  {"showmanual",&ShowAuto},
-                                  {"showhold",&ShowSelection}, {"showholds",&ShowSelection},
-                                  {"showinstall",&ShowSelection}, {"showinstalls",&ShowSelection},
-                                  {"showdeinstall",&ShowSelection}, {"showdeinstalls",&ShowSelection},
-                                  {"showremove",&ShowSelection}, {"showremoves",&ShowSelection},
-                                  {"showpurge",&ShowSelection}, {"showpurges",&ShowSelection},
-                                  // obsolete commands for compatibility
-                                  {"markauto", &DoMarkAuto},
-                                  {"unmarkauto", &DoMarkAuto},
-                                   {0,0}};
-
-   std::vector<CommandLine::Args> Args = getCommandArgs("apt-mark", CommandLine::GetCommand(Cmds, argc, argv));
-
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
-

    CommandLine CmdL;
    CommandLine CmdL;

-   ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_MARK, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

 
    InitOutput();
 
 
    InitOutput();
 

-   // Match the operation
-   CmdL.DispatchArg(Cmds);
-
-   // Print any errors or warnings found during parsing
-   bool const Errors = _error->PendingError();
-   if (_config->FindI("quiet",0) > 0)
-      _error->DumpErrors();
-   else
-      _error->DumpErrors(GlobalError::DEBUG);
-   return Errors == true ? 100 : 0;
+   return DispatchCommandLine(CmdL, Cmds);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/