Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 6ab6548efb56f82edea77f4de17763e14d3c2953..f1edb353bce02dca189006a263b7be4805d23483 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -19,12 +19,13 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
 #include <unistd.h>

-#include <utime.h>

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

+const char *Prog;
+

 class GzipMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
 class GzipMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);


@@ -46,9 +47,18 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    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::Gzip);
+   FileFd From;
+   From.Open(Path, FileFd::ReadOnly, *compressor);

 
    if(From.FileSize() == 0)
       return _error->Error(_("Empty files can't be valid archives"));
 
    if(From.FileSize() == 0)
       return _error->Error(_("Empty files can't be valid archives"));


@@ -83,32 +93,35 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    }
    
    From.Close();
    }
    
    From.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 timespec times[2];
+   times[0].tv_sec = Buf.st_atime;
+   times[1].tv_sec = Buf.st_mtime;
+   times[0].tv_nsec = times[1].tv_nsec = 0;
+   if (futimens(To.Fd(), times) != 0)
+   {
+      To.OpFail();
+      return _error->Errno("futimens",_("Failed to set modification time"));
+   }
+   Res.Size = To.FileSize();
+   To.Close();

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

-   
+

    // Return a Done response
    Res.LastModified = Buf.st_mtime;
    // 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;
 }
                                                                        /*}}}*/


@@ -117,6 +130,9 @@ int main(int argc, char *argv[])
 {
    setlocale(LC_ALL, "");
 
 {
    setlocale(LC_ALL, "");
 

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

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