Merge branch 'feature/extractar-filefd' into debian/experimental

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index a51497948646d1d0ac98e2bb70017f1cbbcaaf7b..637aae1249ba88ab4457291546905b768c3e0ee2 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -11,29 +11,44 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

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

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

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

 #include <apt-pkg/hashes.h>
 #include <apt-pkg/hashes.h>

+#include <apt-pkg/strutl.h>
+#include <apt-pkg/aptconfiguration.h>

 
 

+#include <string.h>

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

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

 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

+const char *Prog;
+

 class GzipMethod : public pkgAcqMethod
 {
 class GzipMethod : public pkgAcqMethod
 {

-   virtual bool Fetch(FetchItem *Itm);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;

    
    public:
    
    GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
 };
 
    
    public:
    
    GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
 };
 

+bool GzipMethod::Configuration(std::string Message)
+{
+   if (pkgAcqMethod::Configuration(Message) == false)
+      return false;
+
+   DropPrivsOrDie();
+
+   return true;
+}

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


@@ -46,20 +61,37 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    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::ReadOnlyGzip);

 
 

-   if(From.FileSize() == 0)
-      return _error->Error(_("Empty files can't be valid archives"));
+   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);

 
 

-   FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
+   // Open the source and destination files
+   FileFd From, To;
+   if (_config->FindB("Method::Compress", false) == false)
+   {
+      From.Open(Path, FileFd::ReadOnly, *compressor);
+      if(From.FileSize() == 0)
+        return _error->Error(_("Empty files can't be valid archives"));
+      To.Open(Itm->DestFile, FileFd::WriteAtomic);
+   }
+   else
+   {
+      From.Open(Path, FileFd::ReadOnly);
+      To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor);
+   }

    To.EraseOnFailure();
    To.EraseOnFailure();

-   if (_error->PendingError() == true)
+
+   if (From.IsOpen() == false || From.Failed() == true ||
+        To.IsOpen() == false || To.Failed() == true)

       return false;
       return false;

-   
+

    // Read data from source, generate checksums and write
    // Read data from source, generate checksums and write

-   Hashes Hash;
+   Hashes Hash(Itm->ExpectedHashes);

    bool Failed = false;
    while (1) 
    {
    bool Failed = false;
    while (1) 
    {


@@ -83,40 +115,40 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    }
    
    From.Close();
    }
    
    From.Close();

+   Res.Size = To.FileSize();

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

-   
+

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

-   
+

    // Transfer the modification times
    struct stat Buf;
    if (stat(Path.c_str(),&Buf) != 0)
       return _error->Errno("stat",_("Failed to stat"));
 
    // Transfer the modification times
    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"));

 
 

-   if (stat(Itm->DestFile.c_str(),&Buf) != 0)
-      return _error->Errno("stat",_("Failed to stat"));
-   

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

-   Res.LastModified = Buf.st_mtime;
-   Res.Size = Buf.st_size;

    Res.TakeHashes(Hash);
 
    URIDone(Res);
    Res.TakeHashes(Hash);
 
    URIDone(Res);

-   

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

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

 {
    setlocale(LC_ALL, "");
 
 {
    setlocale(LC_ALL, "");
 

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

    GzipMethod Mth;
    GzipMethod Mth;

+

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