* apt-pkg/indexcopy.cc:

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index f732c0b8600f227bd98e0fb088038aea4383e8c8..48c8e98926e05881e616eb345f75252edc5c67fd 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -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>


@@ -41,95 +43,57 @@ 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);

-   
-   // Open the source and destination files
-   FileFd From(Path,FileFd::ReadOnly);

 
 

-   // if the file is empty, just rename it and return
-   if(From.Size() == 0) 
-   {
-      rename(Path.c_str(), Itm->DestFile.c_str());
-      return true;
-   }
+   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);

 
 

-   int GzOut[2];   
-   if (pipe(GzOut) < 0)
-      return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
+   // Open the source and destination files
+   FileFd From;
+   From.Open(Path, FileFd::ReadOnly, *compressor);

 
 

-   // Fork gzip
-   pid_t 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];
-      string Tmp = _config->Find(GzPathOption,Prog);
-      Args[0] = Tmp.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);   
+   if(From.FileSize() == 0)
+      return _error->Error(_("Empty files can't be valid archives"));
+
+   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;
+      unsigned long long Count = 0;

       
       

-      Count = read(GzOut[0],Buffer,sizeof(Buffer));
-      if (Count < 0 && errno == EINTR)
-        continue;
-      
-      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)
       {
         Failed = true;
       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
       {
         Failed = true;

-        FromGz.Close();

         break;
       }      
    }
    
         break;
       }      
    }
    

-   // 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)


@@ -164,10 +128,9 @@ int main(int argc, char *argv[])
 {
    setlocale(LC_ALL, "");
 
 {
    setlocale(LC_ALL, "");
 

-   GzipMethod Mth;
-

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

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

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