* apt-pkg/acquire-item.cc:

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index b9808b30ea47bc312ca4e6a1dde717e752f3ac40..f732c0b8600f227bd98e0fb088038aea4383e8c8 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.7 1999/01/27 02:48:53 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,102 +13,161 @@
 #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 <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>

-#include <wait.h>

 #include <stdio.h>
 #include <stdio.h>

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

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

+const char *Prog;
+

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

-   GzipMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
+   GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};

 };
 
 };
 

+

 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;

+   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 destintation files
-   FileFd From(Get.Path,FileFd::ReadOnly);
-   FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
-   To.EraseOnFailure();
-   if (_error->PendingError() == true)
-      return false;
-   
+   // 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;
+   }
+
+   int GzOut[2];   
+   if (pipe(GzOut) < 0)
+      return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
+

    // Fork gzip
    // Fork gzip

-   int Process = fork();
-   if (Process < 0)
-      return _error->Errno("fork","Couldn't fork gzip");
-   
-   // The child
+   pid_t Process = ExecFork();

    if (Process == 0)
    {
    if (Process == 0)
    {

+      close(GzOut[0]);

       dup2(From.Fd(),STDIN_FILENO);
       dup2(From.Fd(),STDIN_FILENO);

-      dup2(To.Fd(),STDOUT_FILENO);
+      dup2(GzOut[1],STDOUT_FILENO);

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

-      To.Close();
+      close(GzOut[1]);

       SetCloseExec(STDIN_FILENO,false);
       SetCloseExec(STDOUT_FILENO,false);
       
       const char *Args[3];
       SetCloseExec(STDIN_FILENO,false);
       SetCloseExec(STDOUT_FILENO,false);
       
       const char *Args[3];

-      Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
+      string Tmp = _config->Find(GzPathOption,Prog);
+      Args[0] = Tmp.c_str();

       Args[1] = "-d";
       Args[2] = 0;
       execvp(Args[0],(char **)Args);
       Args[1] = "-d";
       Args[2] = 0;
       execvp(Args[0],(char **)Args);

-      exit(100);
+      _exit(100);

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

+   close(GzOut[1]);

    
    

-   // Wait for gzip to finish
-   int Status;
-   if (waitpid(Process,&Status,0) != Process)
+   FileFd FromGz(GzOut[0]);  // For autoclose   
+   FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
+   To.EraseOnFailure();
+   if (_error->PendingError() == true)
+      return false;
+   
+   // Read data from gzip, generate checksums and write
+   Hashes Hash;
+   bool Failed = false;
+   while (1) 

    {
    {

-      To.OpFail();
-      return _error->Errno("wait","Waiting for gzip failed");
-   }    
+      unsigned char Buffer[4*1024];
+      unsigned long Count;
+      
+      Count = read(GzOut[0],Buffer,sizeof(Buffer));
+      if (Count < 0 && errno == EINTR)
+        continue;
+      
+      if (Count < 0)
+      {
+        _error->Errno("read", _("Read error from %s process"),Prog);
+        Failed = true;
+        break;
+      }
+      
+      if (Count == 0)
+        break;
+      
+      Hash.Add(Buffer,Count);
+      if (To.Write(Buffer,Count) == false)
+      {
+        Failed = true;
+        FromGz.Close();
+        break;
+      }      
+   }

    
    

-   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
+   // Wait for gzip to finish
+   if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false)

    {
       To.OpFail();
    {
       To.OpFail();

-      return _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong.");
-   }    
-   
+      return false;
+   }  
+       

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

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

    // Transfer the modification times
    struct stat Buf;
    // Transfer the modification times
    struct stat Buf;

-   if (stat(Get.Path.c_str(),&Buf) != 0)
-      return _error->Errno("stat","Failed to stat");
+   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)
 
    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)
+      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);
    
    return true;
 }
                                                                        /*}}}*/
 
    URIDone(Res);
    
    return true;
 }
                                                                        /*}}}*/
 

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

 {
 {

+   setlocale(LC_ALL, "");
+

    GzipMethod Mth;
    GzipMethod Mth;

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

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