fix testcase framework to test correctly for virtual packages

[apt.git] / ftparchive / multicompress.cc

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 56a1a41a248eb3c6a10da6995c35b968cd5d218c..bb4beedf9c8b994ec9f92bf4d6dccdf88ae5419e 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: multicompress.cc,v 1.3 2001/05/29 03:48:27 jgg Exp $
+// $Id: multicompress.cc,v 1.4 2003/02/10 07:34:41 doogie Exp $

 /* ######################################################################
 
    MultiCompressor
 /* ######################################################################
 
    MultiCompressor


@@ -14,12 +14,9 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

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

 #include "multicompress.h"
     
 #include "multicompress.h"
     

+#include <apti18n.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>


@@ -37,19 +34,20 @@ const MultiCompress::CompType MultiCompress::Compressors[] =
       {{".","",0,0,0,1},
        {"gzip",".gz","gzip","-9n","-d",2},
        {"bzip2",".bz2","bzip2","-9","-d",3},
       {{".","",0,0,0,1},
        {"gzip",".gz","gzip","-9n","-d",2},
        {"bzip2",".bz2","bzip2","-9","-d",3},

+       {"lzma",".lzma","lzma","-9","-d",4},

        {}};
 
 // 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 */
    
    /* Parse the compression string, a space separated lists of compresison
       types */


@@ -71,7 +69,7 @@ MultiCompress::MultiCompress(string Output,string Compress,
       // Hmm.. unknown.
       if (Comp->Name == 0)
       {
       // Hmm.. unknown.
       if (Comp->Name == 0)
       {

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

         continue;
       }
       
         continue;
       }
       


@@ -101,7 +99,7 @@ MultiCompress::MultiCompress(string Output,string Compress,
 
    if (Outputs == 0)
    {
 
    if (Outputs == 0)
    {

-      _error->Error("Compressed output %s needs a compression set",Output.c_str());
+      _error->Error(_("Compressed output %s needs a compression set"),Output.c_str());

       return;
    }
 
       return;
    }
 


@@ -128,7 +126,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 */


@@ -168,7 +166,7 @@ bool MultiCompress::Start()
    // Create a data pipe
    int Pipe[2] = {-1,-1};
    if (pipe(Pipe) != 0)
    // Create a data pipe
    int Pipe[2] = {-1,-1};
    if (pipe(Pipe) != 0)

-      return _error->Errno("pipe","Failed to create IPC pipe to subprocess");
+      return _error->Errno("pipe",_("Failed to create IPC pipe to subprocess"));

    for (int I = 0; I != 2; I++)
       SetCloseExec(Pipe[I],true);
    
    for (int I = 0; I != 2; I++)
       SetCloseExec(Pipe[I],true);
    


@@ -194,10 +192,10 @@ bool MultiCompress::Start()
    close(Pipe[0]);
    Input = fdopen(Pipe[1],"w");
    if (Input == 0)
    close(Pipe[0]);
    Input = fdopen(Pipe[1],"w");
    if (Input == 0)

-      return _error->Errno("fdopen","Failed to create FILE*");
+      return _error->Errno("fdopen",_("Failed to create FILE*"));

    
    if (Outputter == -1)
    
    if (Outputter == -1)

-      return _error->Errno("fork","Failed to fork");   
+      return _error->Errno("fork",_("Failed to fork"));   

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


@@ -211,7 +209,7 @@ bool MultiCompress::Die()
    
    fclose(Input);
    Input = 0;
    
    fclose(Input);
    Input = 0;

-   bool Res = ExecWait(Outputter,"Compress Child",false);
+   bool Res = ExecWait(Outputter,_("Compress child"),false);

    Outputter = -1;
    return Res;
 }
    Outputter = -1;
    return Res;
 }


@@ -234,7 +232,7 @@ bool MultiCompress::Finalize(unsigned long &OutSize)
    {
       struct stat St;
       if (stat(I->Output.c_str(),&St) != 0)
    {
       struct stat St;
       if (stat(I->Output.c_str(),&St) != 0)

-        return  _error->Error("Internal Error, Failed to create %s",
+        return  _error->Error(_("Internal error, failed to create %s"),

                               I->Output.c_str());
       
       if (I->OldMTime != St.st_mtime)
                               I->Output.c_str());
       
       if (I->OldMTime != St.st_mtime)


@@ -270,8 +268,8 @@ 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,int &Pid,int FileFd,
-                                int &OutFd,bool Comp)
+bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int const &FileFd,
+                                int &OutFd,bool const &Comp)

 {
    Pid = -1;
    
 {
    Pid = -1;
    


@@ -285,7 +283,7 @@ bool MultiCompress::OpenCompress(const CompType *Prog,int &Pid,int FileFd,
    // Create a data pipe
    int Pipe[2] = {-1,-1};
    if (pipe(Pipe) != 0)
    // Create a data pipe
    int Pipe[2] = {-1,-1};
    if (pipe(Pipe) != 0)

-      return _error->Errno("pipe","Failed to create subprocess IPC");
+      return _error->Errno("pipe",_("Failed to create subprocess IPC"));

    for (int J = 0; J != 2; J++)
       SetCloseExec(Pipe[J],true);
 
    for (int J = 0; J != 2; J++)
       SetCloseExec(Pipe[J],true);
 


@@ -320,7 +318,7 @@ bool MultiCompress::OpenCompress(const CompType *Prog,int &Pid,int FileFd,
         Args[1] = Prog->UnCompArgs;
       Args[2] = 0;
       execvp(Args[0],(char **)Args);
         Args[1] = Prog->UnCompArgs;
       Args[2] = 0;
       execvp(Args[0],(char **)Args);

-      cerr << "Failed to exec compressor " << Args[0] << endl;
+      cerr << _("Failed to exec compressor ") << Args[0] << endl;

       _exit(100);
    };      
    if (Comp == true)
       _exit(100);
    };      
    if (Comp == true)


@@ -333,7 +331,7 @@ bool MultiCompress::OpenCompress(const CompType *Prog,int &Pid,int FileFd,
 // MultiCompress::OpenOld - Open an old file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens one of the original output files, possibly decompressing it. */
 // MultiCompress::OpenOld - Open an old file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens one of the original output files, possibly decompressing it. */

-bool MultiCompress::OpenOld(int &Fd,int &Proc)
+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)


@@ -355,11 +353,11 @@ bool MultiCompress::OpenOld(int &Fd,int &Proc)
 // MultiCompress::CloseOld - Close the old file                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // MultiCompress::CloseOld - Close the old file                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool MultiCompress::CloseOld(int Fd,int Proc)
+bool MultiCompress::CloseOld(int Fd,pid_t Proc)

 {
    close(Fd);
    if (Proc != -1)
 {
    close(Fd);
    if (Proc != -1)

-      if (ExecWait(Proc,"decompressor",false) == false)
+      if (ExecWait(Proc,_("decompressor"),false) == false)

         return false;
    return true;
 }   
         return false;
    return true;
 }   


@@ -367,11 +365,11 @@ bool MultiCompress::CloseOld(int Fd,int 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)


@@ -402,7 +400,7 @@ bool MultiCompress::Child(int FD)
       {
         if (write(I->Fd,Buffer,Res) != Res)
         {
       {
         if (write(I->Fd,Buffer,Res) != Res)
         {

-           _error->Errno("write","IO to subprocess/file failed");
+           _error->Errno("write",_("IO to subprocess/file failed"));

            break;
         }
       }      
            break;
         }
       }      


@@ -438,7 +436,7 @@ bool MultiCompress::Child(int FD)
    while (Missing == false)
    {
       int CompFd = -1;
    while (Missing == false)
    {
       int CompFd = -1;

-      int Proc = -1;
+      pid_t Proc = -1;

       if (OpenOld(CompFd,Proc) == false)
       {
         _error->Discard();
       if (OpenOld(CompFd,Proc) == false)
       {
         _error->Discard();


@@ -454,7 +452,7 @@ bool MultiCompress::Child(int FD)
         if (Res == 0)
            break;
         if (Res < 0)
         if (Res == 0)
            break;
         if (Res < 0)

-           return _error->Errno("read","Failed to read while computing MD5");
+           return _error->Errno("read",_("Failed to read while computing MD5"));

         NewFileSize += Res;
         OldMD5.Add(Buffer,Res);
       }
         NewFileSize += Res;
         OldMD5.Add(Buffer,Res);
       }


@@ -471,7 +469,7 @@ bool MultiCompress::Child(int FD)
         {
            I->TmpFile.Close();
            if (unlink(I->TmpFile.Name().c_str()) != 0)
         {
            I->TmpFile.Close();
            if (unlink(I->TmpFile.Name().c_str()) != 0)

-              _error->Errno("unlink","Problem unlinking %s",
+              _error->Errno("unlink",_("Problem unlinking %s"),

                             I->TmpFile.Name().c_str());
         }
         return !_error->PendingError();
                             I->TmpFile.Name().c_str());
         }
         return !_error->PendingError();


@@ -486,7 +484,7 @@ bool MultiCompress::Child(int FD)
       fchmod(I->TmpFile.Fd(),Permissions);
       
       if (rename(I->TmpFile.Name().c_str(),I->Output.c_str()) != 0)
       fchmod(I->TmpFile.Fd(),Permissions);
       
       if (rename(I->TmpFile.Name().c_str(),I->Output.c_str()) != 0)

-        _error->Errno("rename","Failed to rename %s to %s",
+        _error->Errno("rename",_("Failed to rename %s to %s"),

                       I->TmpFile.Name().c_str(),I->Output.c_str());
       I->TmpFile.Close();
    }
                       I->TmpFile.Name().c_str(),I->Output.c_str());
       I->TmpFile.Close();
    }