ignore lost+found in private directory cleanup

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index be4f82e6f9670362e34fccb699d55cfccffcd016..c470807ac9b73a547ac9cd0b75dc9dbaba164a3e 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.4 1998/11/01 05:27:43 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,25 +9,34 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>
+#include <config.h>
+
+#include <apt-pkg/configuration.h>

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

-#include <strutl.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/aptconfiguration.h>
+#include "aptmethod.h"

 
 

+#include <string.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <unistd.h>
-#include <utime.h>
-#include <wait.h>
-#include <stdio.h>
+#include <sys/time.h>
+#include <string>
+#include <vector>
+
+#include <apti18n.h>

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

-class GzipMethod : public pkgAcqMethod
+class GzipMethod : public aptMethod

 {
 {

-   virtual bool Fetch(FetchItem *Itm);
-   
+   std::string const Prog;
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+

    public:
    public:

-   
-   GzipMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
+
+   explicit GzipMethod(std::string const &pProg) : aptMethod(pProg.c_str(),"1.1",SingleInstance | SendConfig), Prog(pProg) {};

 };
 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 };
 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/


@@ -36,77 +45,107 @@ class GzipMethod : public pkgAcqMethod
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;

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

    
    

-   // Open the source and destintation files
-   FileFd From(Get.Path,FileFd::ReadOnly);
-   FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
-   To.EraseOnFailure();
-   if (_error->PendingError() == true)
-      return false;
-   
-   // Fork gzip
-   int Process = fork();
-   if (Process < 0)
-      return _error->Errno("fork","Couldn't fork gzip");
-   
-   // The child
-   if (Process == 0)
+   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.c_str());
+
+   // Open the source and destination files
+   FileFd From;
+   if (_config->FindB("Method::Compress", false) == false)

    {
    {

-      dup2(From.Fd(),STDIN_FILENO);
-      dup2(To.Fd(),STDOUT_FILENO);
-      From.Close();
-      To.Close();
-      SetCloseExec(STDIN_FILENO,false);
-      SetCloseExec(STDOUT_FILENO,false);
-      
-      const char *Args[3];
-      Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
-      Args[1] = "-d";
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
-      exit(100);
+      From.Open(Path, FileFd::ReadOnly, *compressor);
+      if(From.FileSize() == 0)
+        return _error->Error(_("Empty files can't be valid archives"));

    }
    }

-   From.Close();
-   
-   // Wait for gzip to finish
-   int Status;
-   if (waitpid(Process,&Status,0) != Process)
+   else
+      From.Open(Path, FileFd::ReadOnly);
+   if (From.IsOpen() == false || From.Failed() == true)
+      return false;
+
+   FileFd To;
+   if (Itm->DestFile != "/dev/null")

    {
    {

-      To.OpFail();
-      return _error->Errno("wait","Waiting for gzip failed");
-   }    
-   
-   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
+      if (_config->FindB("Method::Compress", false) == false)
+        To.Open(Itm->DestFile, FileFd::WriteAtomic);
+      else
+        To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor);
+
+      if (To.IsOpen() == false || To.Failed() == true)
+        return false;
+      To.EraseOnFailure();
+   }
+
+
+   // Read data from source, generate checksums and write
+   Hashes Hash(Itm->ExpectedHashes);
+   bool Failed = false;
+   Res.Size = 0;
+   while (1) 

    {
    {

-      To.OpFail();
-      return _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong.");
-   }    
+      unsigned char Buffer[4*1024];
+      unsigned long long Count = 0;
+      
+      if (!From.Read(Buffer,sizeof(Buffer),&Count))
+      {
+        if (To.IsOpen())
+           To.OpFail();
+        return false;
+      }
+      if (Count == 0)
+        break;
+      Res.Size += Count;
+
+      Hash.Add(Buffer,Count);
+      if (To.IsOpen() && To.Write(Buffer,Count) == false)
+      {
+        Failed = true;
+        break;
+      }      
+   }

    
    

+   From.Close();

    To.Close();
    To.Close();

-   
+
+   if (Failed == true)
+      return false;
+

    // Transfer the modification times
    // Transfer the modification times

-   struct stat Buf;
-   if (stat(Get.Path.c_str(),&Buf) != 0)
-      return _error->Errno("stat","Failed to stat");
+   if (Itm->DestFile != "/dev/null")
+   {
+      struct stat Buf;
+      if (stat(Path.c_str(),&Buf) != 0)
+        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)
-      return _error->Errno("utime","Failed to set modification time");
+      struct timeval times[2];
+      times[0].tv_sec = Buf.st_atime;
+      Res.LastModified = times[1].tv_sec = Buf.st_mtime;
+      times[0].tv_usec = times[1].tv_usec = 0;
+      if (utimes(Itm->DestFile.c_str(), times) != 0)
+        return _error->Errno("utimes",_("Failed to set modification time"));
+   }

 
    // Return a Done response
 
    // Return a Done response

-   FetchResult Res;
-   Res.LastModified = Buf.st_mtime;
-   Res.Filename = Itm->DestFile;
+   Res.TakeHashes(Hash);
+

    URIDone(Res);
    URIDone(Res);

-   

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

-int main()
+int main(int, char *argv[])

 {
 {

-   GzipMethod Mth;
+   setlocale(LC_ALL, "");
+
+   GzipMethod Mth(flNotDir(argv[0]));

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