[ Martin Pitt ]

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index f58a7263dc958448afa41b4ebab885e45bf01236..72e3ac90941fa904ca0de1e7d1ad1e73a9d351cf 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.11 2001/03/06 03:11:22 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 


@@ -13,11 +13,14 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>

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

 
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>
 #include <stdio.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>
 #include <stdio.h>

+#include <errno.h>
+#include <apti18n.h>

                                                                        /*}}}*/
 
 class GzipMethod : public pkgAcqMethod
                                                                        /*}}}*/
 
 class GzipMethod : public pkgAcqMethod


@@ -29,6 +32,7 @@ class GzipMethod : public pkgAcqMethod
    GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
 };
 
    GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
 };
 

+

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


@@ -36,77 +40,85 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
    string Path = Get.Host + Get.Path; // To account for relative paths
 {
    URI Get = Itm->Uri;
    string Path = Get.Host + Get.Path; // To account for relative paths

-   string GzipPath = _config->Find("Dir::bin::gzip","gzip");

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

-   // Open the source and destintation files
-   FileFd From(Path,FileFd::ReadOnly);
+   // Open the source and destination files
+   FileFd From(Path,FileFd::ReadOnlyGzip);
+
+   // if the file is empty, just rename it and return
+   if(From.Size() == 0) 
+   {
+      rename(Path.c_str(), Itm->DestFile.c_str());
+      return true;
+   }
+

    FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
    To.EraseOnFailure();
    if (_error->PendingError() == true)
       return false;
    
    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",string("Couldn't fork "+GzipPath).c_str());
-   
-   // The child
-   if (Process == 0)
+   // Read data from source, generate checksums and write
+   Hashes Hash;
+   bool Failed = false;
+   while (1) 

    {
    {

-      dup2(From.Fd(),STDIN_FILENO);
-      dup2(To.Fd(),STDOUT_FILENO);
-      From.Close();
-      To.Close();
-      SetCloseExec(STDIN_FILENO,false);
-      SetCloseExec(STDOUT_FILENO,false);
+      unsigned char Buffer[4*1024];
+      unsigned long Count;

       
       

-      const char *Args[3];
-      Args[0] = GzipPath.c_str();
-      Args[1] = "-d";
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
-      exit(100);
+      if (!From.Read(Buffer,sizeof(Buffer),&Count))
+      {
+        To.OpFail();
+        return false;
+      }
+      if (Count == 0)
+        break;
+
+      Hash.Add(Buffer,Count);
+      if (To.Write(Buffer,Count) == false)
+      {
+        Failed = true;
+        break;
+      }      

    }
    }

+   

    From.Close();
    From.Close();

+   To.Close();

    
    

-   // Wait for gzip to finish
-   if (ExecWait(Process,GzipPath.c_str(),false) == false)
-   {
-      To.OpFail();
+   if (Failed == true)

       return false;
       return false;

-   }  
-       
-   To.Close();

    
    // 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.TakeHashes(Hash);
+

    URIDone(Res);
    
    return true;
 }
                                                                        /*}}}*/
 
    URIDone(Res);
    
    return true;
 }
                                                                        /*}}}*/
 

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

 {
 {

+   setlocale(LC_ALL, "");
+

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