append the dist (e.g. sid, wheezy) as a query string when

[apt.git] / ftparchive / multicompress.cc

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index a3512c787443b26d1105cb28f7f29572afb5c413..f82879015f2a00b5b1d73363248145c3d738e332 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -14,10 +14,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "multicompress.h"
-#endif
-

 #include "multicompress.h"
     
 #include <apti18n.h>
 #include "multicompress.h"
     
 #include <apti18n.h>


@@ -34,24 +30,19 @@
 
 using namespace std;
 
 
 using namespace std;
 

-const MultiCompress::CompType MultiCompress::Compressors[] =
-      {{".","",0,0,0,1},
-       {"gzip",".gz","gzip","-9n","-d",2},
-       {"bzip2",".bz2","bzip2","-9","-d",3},
-       {}};

 
 // MultiCompress::MultiCompress - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* Setup the file outputs, compression modes and fork the writer child */
 
 // MultiCompress::MultiCompress - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* Setup the file outputs, compression modes and fork the writer child */

-MultiCompress::MultiCompress(string Output,string Compress,
-                            mode_t Permissions,bool Write)
+MultiCompress::MultiCompress(string const &Output,string const &Compress,
+                            mode_t const &Permissions,bool const &Write) :
+                       Permissions(Permissions)

 {
    Outputs = 0;
    Outputter = -1;
    Input = 0;
    UpdateMTime = 0;
 {
    Outputs = 0;
    Outputter = -1;
    Input = 0;
    UpdateMTime = 0;

-   this->Permissions = Permissions;
-   
+

    /* Parse the compression string, a space separated lists of compresison
       types */
    string::const_iterator I = Compress.begin();
    /* Parse the compression string, a space separated lists of compresison
       types */
    string::const_iterator I = Compress.begin();


@@ -64,13 +55,14 @@ MultiCompress::MultiCompress(string Output,string Compress,
       for (; I != Compress.end() && !isspace(*I); I++);
 
       // Find the matching compressor
       for (; I != Compress.end() && !isspace(*I); I++);
 
       // Find the matching compressor

-      const CompType *Comp = Compressors;
-      for (; Comp->Name != 0; Comp++)
-        if (stringcmp(Start,I,Comp->Name) == 0)
+      std::vector<APT::Configuration::Compressor> Compressors = APT::Configuration::getCompressors();
+      std::vector<APT::Configuration::Compressor>::const_iterator Comp = Compressors.begin();
+      for (; Comp != Compressors.end(); ++Comp)
+        if (stringcmp(Start,I,Comp->Name.c_str()) == 0)

            break;
 
       // Hmm.. unknown.
            break;
 
       // Hmm.. unknown.

-      if (Comp->Name == 0)
+      if (Comp == Compressors.end())

       {
         _error->Warning(_("Unknown compression algorithm '%s'"),string(Start,I).c_str());
         continue;
       {
         _error->Warning(_("Unknown compression algorithm '%s'"),string(Start,I).c_str());
         continue;


@@ -80,7 +72,7 @@ MultiCompress::MultiCompress(string Output,string Compress,
       Files *NewOut = new Files;
       NewOut->Next = Outputs;
       Outputs = NewOut;
       Files *NewOut = new Files;
       NewOut->Next = Outputs;
       Outputs = NewOut;

-      NewOut->CompressProg = Comp;
+      NewOut->CompressProg = *Comp;

       NewOut->Output = Output+Comp->Extension;
       
       struct stat St;
       NewOut->Output = Output+Comp->Extension;
       
       struct stat St;


@@ -129,7 +121,7 @@ MultiCompress::~MultiCompress()
 /* This checks each compressed file to make sure it exists and returns
    stat information for a random file from the collection. False means
    one or more of the files is missing. */
 /* This checks each compressed file to make sure it exists and returns
    stat information for a random file from the collection. False means
    one or more of the files is missing. */

-bool MultiCompress::GetStat(string Output,string Compress,struct stat &St)
+bool MultiCompress::GetStat(string const &Output,string const &Compress,struct stat &St)

 {
    /* Parse the compression string, a space separated lists of compresison
       types */
 {
    /* Parse the compression string, a space separated lists of compresison
       types */


@@ -144,13 +136,14 @@ bool MultiCompress::GetStat(string Output,string Compress,struct stat &St)
       for (; I != Compress.end() && !isspace(*I); I++);
 
       // Find the matching compressor
       for (; I != Compress.end() && !isspace(*I); I++);
 
       // Find the matching compressor

-      const CompType *Comp = Compressors;
-      for (; Comp->Name != 0; Comp++)
-        if (stringcmp(Start,I,Comp->Name) == 0)
+      std::vector<APT::Configuration::Compressor> Compressors = APT::Configuration::getCompressors();
+      std::vector<APT::Configuration::Compressor>::const_iterator Comp = Compressors.begin();
+      for (; Comp != Compressors.end(); ++Comp)
+        if (stringcmp(Start,I,Comp->Name.c_str()) == 0)

            break;
 
       // Hmm.. unknown.
            break;
 
       // Hmm.. unknown.

-      if (Comp->Name == 0)
+      if (Comp == Compressors.end())

         continue;
 
       string Name = Output+Comp->Extension;
         continue;
 
       string Name = Output+Comp->Extension;


@@ -271,13 +264,13 @@ bool MultiCompress::Finalize(unsigned long &OutSize)
 /* This opens the compressor, either in compress mode or decompress 
    mode. FileFd is always the compressor input/output file, 
    OutFd is the created pipe, Input for Compress, Output for Decompress. */
 /* This opens the compressor, either in compress mode or decompress 
    mode. FileFd is always the compressor input/output file, 
    OutFd is the created pipe, Input for Compress, Output for Decompress. */

-bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd,
-                                int &OutFd,bool Comp)
+bool MultiCompress::OpenCompress(APT::Configuration::Compressor const &Prog,
+                                pid_t &Pid,int const &FileFd,int &OutFd,bool const &Comp)

 {
    Pid = -1;
    
    // No compression
 {
    Pid = -1;
    
    // No compression

-   if (Prog->Binary == 0)
+   if (Prog.Binary.empty() == true)

    {
       OutFd = dup(FileFd);
       return true;
    {
       OutFd = dup(FileFd);
       return true;


@@ -312,15 +305,17 @@ bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd,
       
       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);
       
       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);

-      
-      const char *Args[3];
-      Args[0] = Prog->Binary;
-      if (Comp == true)
-        Args[1] = Prog->CompArgs;
-      else
-        Args[1] = Prog->UnCompArgs;
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
+
+      std::vector<char const*> Args;
+      Args.push_back(Prog.Binary.c_str());
+      std::vector<std::string> const * const addArgs =
+               (Comp == true) ? &(Prog.CompressArgs) : &(Prog.UncompressArgs);
+      for (std::vector<std::string>::const_iterator a = addArgs->begin();
+          a != addArgs->end(); ++a)
+        Args.push_back(a->c_str());
+      Args.push_back(NULL);
+
+      execvp(Args[0],(char **)&Args[0]);

       cerr << _("Failed to exec compressor ") << Args[0] << endl;
       _exit(100);
    };      
       cerr << _("Failed to exec compressor ") << Args[0] << endl;
       _exit(100);
    };      


@@ -338,7 +333,7 @@ bool MultiCompress::OpenOld(int &Fd,pid_t &Proc)
 {
    Files *Best = Outputs;
    for (Files *I = Outputs; I != 0; I = I->Next)
 {
    Files *Best = Outputs;
    for (Files *I = Outputs; I != 0; I = I->Next)

-      if (Best->CompressProg->Cost > I->CompressProg->Cost)
+      if (Best->CompressProg.Cost > I->CompressProg.Cost)

         Best = I;
 
    // Open the file
         Best = I;
 
    // Open the file


@@ -368,11 +363,11 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc)
 // MultiCompress::Child - The writer child                             /*{{{*/
 // ---------------------------------------------------------------------
 /* The child process forks a bunch of compression children and takes 
 // MultiCompress::Child - The writer child                             /*{{{*/
 // ---------------------------------------------------------------------
 /* The child process forks a bunch of compression children and takes 

-   input on FD and passes it to all the compressor childer. On the way it
+   input on FD and passes it to all the compressor child. On the way it

    computes the MD5 of the raw data. After this the raw data in the 
    original files is compared to see if this data is new. If the data
    is new then the temp files are renamed, otherwise they are erased. */
    computes the MD5 of the raw data. After this the raw data in the 
    original files is compared to see if this data is new. If the data
    is new then the temp files are renamed, otherwise they are erased. */

-bool MultiCompress::Child(int FD)
+bool MultiCompress::Child(int const &FD)

 {
    // Start the compression children.
    for (Files *I = Outputs; I != 0; I = I->Next)
 {
    // Start the compression children.
    for (Files *I = Outputs; I != 0; I = I->Next)


@@ -417,7 +412,7 @@ bool MultiCompress::Child(int FD)
    for (Files *I = Outputs; I != 0; I = I->Next)
    {
       if (I->CompressProc != -1)
    for (Files *I = Outputs; I != 0; I = I->Next)
    {
       if (I->CompressProc != -1)

-        ExecWait(I->CompressProc,I->CompressProg->Binary,false);
+        ExecWait(I->CompressProc, I->CompressProg.Binary.c_str(), false);

    }
    
    if (_error->PendingError() == true)
    }
    
    if (_error->PendingError() == true)