Various fixes

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index be4f82e6f9670362e34fccb699d55cfccffcd016..78b196115aafae26819414dd8345e090ac83fa74 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.10 2000/03/18 07:39:33 jgg 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 


@@ -12,12 +12,11 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>

-#include <strutl.h>
+#include <apt-pkg/strutl.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>
                                                                        /*}}}*/
 


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

+   string Path = Get.Host + Get.Path; // To account for relative paths
+   
+   FetchResult Res;
+   Res.Filename = Itm->DestFile;
+   URIStart(Res);

    
    // Open the source and destintation files
    
    // Open the source and destintation files

-   FileFd From(Get.Path,FileFd::ReadOnly);
+   FileFd From(Path,FileFd::ReadOnly);

    FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
    To.EraseOnFailure();
    if (_error->PendingError() == true)
    FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
    To.EraseOnFailure();
    if (_error->PendingError() == true)


@@ -69,24 +73,17 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    From.Close();
    
    // Wait for gzip to finish
    From.Close();
    
    // Wait for gzip to finish

-   int Status;
-   if (waitpid(Process,&Status,0) != Process)
-   {
-      To.OpFail();
-      return _error->Errno("wait","Waiting for gzip failed");
-   }    
-   
-   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
+   if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").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();
    
    // Transfer the modification times
    struct stat Buf;
    To.Close();
    
    // Transfer the modification times
    struct stat Buf;

-   if (stat(Get.Path.c_str(),&Buf) != 0)
+   if (stat(Path.c_str(),&Buf) != 0)

       return _error->Errno("stat","Failed to stat");
 
    struct utimbuf TimeBuf;
       return _error->Errno("stat","Failed to stat");
 
    struct utimbuf TimeBuf;


@@ -95,10 +92,12 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
       return _error->Errno("utime","Failed to set modification time");
 
    if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
       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
    // Return a Done response

-   FetchResult Res;

    Res.LastModified = Buf.st_mtime;
    Res.LastModified = Buf.st_mtime;

-   Res.Filename = Itm->DestFile;
+   Res.Size = Buf.st_size;

    URIDone(Res);
    
    return true;
    URIDone(Res);
    
    return true;