debian/control: Set Standards-Version to 3.9.7

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

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 971900e4f839d0e806a0ffd5faf48340d2a1ca8b..9495ee354a04d3242d6ae79688a7d9e90f0441bc 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -24,12 +24,14 @@
 #include <apt-pkg/pkgsystem.h>
 
 #include <apt-private/private-cmndline.h>
 #include <apt-pkg/pkgsystem.h>
 
 #include <apt-private/private-cmndline.h>

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

 
 #include <vector>
 #include <algorithm>
 #include <stdio.h>
 #include <iostream>
 #include <string>
 
 #include <vector>
 #include <algorithm>
 #include <stdio.h>
 #include <iostream>
 #include <string>

+#include <memory>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -108,95 +110,58 @@ static bool DoIt(string InFile)
    const char **Order = TFRewritePackageOrder;
    if (Source == true)
       Order = TFRewriteSourceOrder;
    const char **Order = TFRewritePackageOrder;
    if (Source == true)
       Order = TFRewriteSourceOrder;

-   
+

    // Emit
    // Emit

-   unsigned char *Buffer = new unsigned char[Largest+1];
+   FileFd stdoutfd;
+   stdoutfd.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, false);
+   auto const Buffer = std::unique_ptr<unsigned char[]>(new unsigned char[Largest+1]);

    for (vector<PkgName>::iterator I = List.begin(); I != List.end(); ++I)
    {
       // Read in the Record.
    for (vector<PkgName>::iterator I = List.begin(); I != List.end(); ++I)
    {
       // Read in the Record.

-      if (Fd.Seek(I->Offset) == false || Fd.Read(Buffer,I->Length) == false)
-      {
-        delete [] Buffer;
+      if (Fd.Seek(I->Offset) == false || Fd.Read(Buffer.get(),I->Length) == false)

         return false;
         return false;

-      }
-      
-      Buffer[I->Length] = '\n';      
-      if (Section.Scan((char *)Buffer,I->Length+1) == false)
-      {
-        delete [] Buffer;
+
+      Buffer[I->Length] = '\n';
+      if (Section.Scan((char *)Buffer.get(),I->Length+1) == false)

         return _error->Error("Internal error, failed to scan buffer");
         return _error->Error("Internal error, failed to scan buffer");

-      }

 
       // Sort the section
 
       // Sort the section

-      if (TFRewrite(stdout,Section,Order,0) == false)
-      {
-        delete [] Buffer;
+      if (Section.Write(stdoutfd, Order) == false || stdoutfd.Write("\n", 1) == false)

         return _error->Error("Internal error, failed to sort fields");
         return _error->Error("Internal error, failed to sort fields");

-      }
-      
-      fputc('\n',stdout);      

    }
    }

-   
-   delete [] Buffer;

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

-// ShowHelp - Show the help text                                       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
 {

-   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-   if (_config->FindB("version") == true)
-      return true;
-   
-   cout <<
+   std::cout <<

     _("Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
       "\n"
     _("Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
       "\n"

-      "apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-      "to indicate what kind of file it is.\n"
-      "\n"
-      "Options:\n"
-      "  -h   This help text\n"
-      "  -s   Use source file sorting\n"
-      "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
-
+      "apt-sortpkgs is a simple tool to sort package information files.\n"
+      "By default it sorts by binary package information, but the -s option\n"
+      "can be used to switch to source package ordering instead.\n");

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

+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/
+{
+   return {
+      {nullptr, nullptr, nullptr}
+   };
+}
+                                                                       /*}}}*/

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

-   CommandLine::Args Args[] = {
-      {'h',"help","help",0},
-      {'v',"version","version",0},
-      {'s',"source","APT::SortPkgs::Source",0},
-      {'c',"config-file",0,CommandLine::ConfigFile},
-      {'o',"option",0,CommandLine::ArbItem},
-      {0,0,0,0}};
+   InitLocale();

 
 

-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
-
-   // Parse the command line and initialize the package library
-   CommandLine::Dispatch Cmds[] = {{NULL, NULL}};

    CommandLine CmdL;
    CommandLine CmdL;

-   ParseCommandLine(CmdL, Cmds, Args, &_config, &_system, argc, argv, ShowHelp);
+   ParseCommandLine(CmdL, APT_CMD::APT_SORTPKG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

 
    // Match the operation
    for (unsigned int I = 0; I != CmdL.FileSize(); I++)
       if (DoIt(CmdL.FileList[I]) == false)
         break;
 
    // Match the operation
    for (unsigned int I = 0; I != CmdL.FileSize(); I++)
       if (DoIt(CmdL.FileList[I]) == false)
         break;

-   
-   // Print any errors or warnings found during parsing
-   if (_error->empty() == false)
-   {
-      bool Errors = _error->PendingError();
-      _error->DumpErrors();
-      return Errors == true?100:0;
-   }
-   
-   return 0;   
+
+   return DispatchCommandLine(CmdL, {});

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