Merge remote-tracking branch 'origin/bugfix/bts731738-fancy-progess' into bugfix...

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 3f0efab4f47f78ed136714522d92d21d51c830d4..48c8e98926e05881e616eb345f75252edc5c67fd 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: gzip.cc,v 1.14 2001/03/11 22:37:35 jgg Exp $
+// $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 


@@ -9,6 +9,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>


@@ -20,6 +22,7 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>

+#include <apti18n.h>

                                                                        /*}}}*/
 
 const char *Prog;
                                                                        /*}}}*/
 
 const char *Prog;


@@ -40,71 +43,48 @@ class GzipMethod : public pkgAcqMethod
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;

-   string Path = Get.Host + Get.Path; // To account for relative paths
+   std::string Path = Get.Host + Get.Path; // To account for relative paths

    
    

-   string GzPathOption = "Dir::bin::"+string(Prog);
-

    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);
    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);

-   
+
+   std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+   std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
+   for (; compressor != compressors.end(); ++compressor)
+      if (compressor->Name == Prog)
+        break;
+   if (compressor == compressors.end())
+      return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog);
+

    // Open the source and destination files
    // Open the source and destination files

-   FileFd From(Path,FileFd::ReadOnly);
+   FileFd From;
+   From.Open(Path, FileFd::ReadOnly, *compressor);

 
 

-   int GzOut[2];   
-   if (pipe(GzOut) < 0)
-      return _error->Errno("pipe","Couldn't open pipe for %s",Prog);
+   if(From.FileSize() == 0)
+      return _error->Error(_("Empty files can't be valid archives"));

 
 

-   // Fork gzip
-   int Process = ExecFork();
-   if (Process == 0)
-   {
-      close(GzOut[0]);
-      dup2(From.Fd(),STDIN_FILENO);
-      dup2(GzOut[1],STDOUT_FILENO);
-      From.Close();
-      close(GzOut[1]);
-      SetCloseExec(STDIN_FILENO,false);
-      SetCloseExec(STDOUT_FILENO,false);
-      
-      const char *Args[3];
-      Args[0] = _config->Find(GzPathOption,Prog).c_str();
-      Args[1] = "-d";
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
-      _exit(100);
-   }
-   From.Close();
-   close(GzOut[1]);
-   
-   FileFd FromGz(GzOut[0]);  // For autoclose   
-   FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
+   FileFd To(Itm->DestFile,FileFd::WriteAtomic);   

    To.EraseOnFailure();
    if (_error->PendingError() == true)
       return false;
    
    To.EraseOnFailure();
    if (_error->PendingError() == true)
       return false;
    

-   // Read data from gzip, generate checksums and write
+   // Read data from source, generate checksums and write

    Hashes Hash;
    bool Failed = false;
    while (1) 
    {
       unsigned char Buffer[4*1024];
    Hashes Hash;
    bool Failed = false;
    while (1) 
    {
       unsigned char Buffer[4*1024];

-      unsigned long Count;
-      
-      Count = read(GzOut[0],Buffer,sizeof(Buffer));
-      if (Count < 0 && errno == EINTR)
-        continue;
+      unsigned long long Count = 0;

       
       

-      if (Count < 0)
+      if (!From.Read(Buffer,sizeof(Buffer),&Count))

       {
       {

-        _error->Errno("read", "Read error from %s process",Prog);
-        Failed = true;
-        break;
+        To.OpFail();
+        return false;

       }
       }

-      

       if (Count == 0)
         break;
       if (Count == 0)
         break;

-      
+

       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
       {
       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
       {


@@ -113,13 +93,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       }      
    }
    
       }      
    }
    

-   // Wait for gzip to finish
-   if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false)
-   {
-      To.OpFail();
-      return false;
-   }  
-       
+   From.Close();

    To.Close();
    
    if (Failed == true)
    To.Close();
    
    if (Failed == true)


@@ -128,21 +102,21 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // Transfer the modification times
    struct stat Buf;
    if (stat(Path.c_str(),&Buf) != 0)
    // Transfer the modification times
    struct stat Buf;
    if (stat(Path.c_str(),&Buf) != 0)

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

 
    struct utimbuf TimeBuf;
    TimeBuf.actime = Buf.st_atime;
    TimeBuf.modtime = Buf.st_mtime;
    if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
 
    struct utimbuf TimeBuf;
    TimeBuf.actime = Buf.st_atime;
    TimeBuf.modtime = Buf.st_mtime;
    if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)

-      return _error->Errno("utime","Failed to set modification time");
+      return _error->Errno("utime",_("Failed to set modification time"));

 
    if (stat(Itm->DestFile.c_str(),&Buf) != 0)
 
    if (stat(Itm->DestFile.c_str(),&Buf) != 0)

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

    
    // Return a Done response
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
    
    // Return a Done response
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;

-   Res.MD5Sum = Hash.MD5.Result();
+   Res.TakeHashes(Hash);

 
    URIDone(Res);
    
 
    URIDone(Res);
    


@@ -152,10 +126,11 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-   GzipMethod Mth;
+   setlocale(LC_ALL, "");

 
    Prog = strrchr(argv[0],'/');
 
    Prog = strrchr(argv[0],'/');

-   Prog++;
-   
+   ++Prog;
+
+   GzipMethod Mth;

    return Mth.Run();
 }
    return Mth.Run();
 }