* methods/{gzip,bzip2}.cc:

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index a07df81a2e5d4f156c109701c30317620d605ac3..22cae94244b62e067717d9a2cdf77b832ed07ef7 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: gzip.cc,v 1.16 2001/05/27 04:29:30 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 
@@ -20,10 +20,9 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
+#include <apti18n.h>
                                                                        /*}}}*/
 
-const char *Prog;
-
 class GzipMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
@@ -42,49 +41,23 @@ 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);
    
    // Open the source and destination files
-   FileFd From(Path,FileFd::ReadOnly);
+   FileFd From(Path,FileFd::ReadOnlyGzip);
 
-   int GzOut[2];   
-   if (pipe(GzOut) < 0)
-      return _error->Errno("pipe","Couldn't open pipe for %s",Prog);
+   // FIXME add an error message saying that empty files can't be valid archives
+   if(From.Size() == 0)
+      return false;
 
-   // Fork gzip
-   int Process = ExecFork();
-   if (Process == 0)
-   {
-      close(GzOut[0]);
-      dup2(From.Fd(),STDIN_FILENO);
-      dup2(GzOut[1],STDOUT_FILENO);
-      From.Close();
-      close(GzOut[1]);
-      SetCloseExec(STDIN_FILENO,false);
-      SetCloseExec(STDOUT_FILENO,false);
-      
-      const char *Args[3];
-      string Tmp = _config->Find(GzPathOption,Prog);
-      Args[0] = Tmp.c_str();
-      Args[1] = "-d";
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
-      _exit(100);
-   }
-   From.Close();
-   close(GzOut[1]);
-   
-   FileFd FromGz(GzOut[0]);  // For autoclose   
-   FileFd To(Itm->DestFile,FileFd::WriteEmpty);   
+   FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
    To.EraseOnFailure();
    if (_error->PendingError() == true)
       return false;
    
-   // Read data from gzip, generate checksums and write
+   // Read data from source, generate checksums and write
    Hashes Hash;
    bool Failed = false;
    while (1) 
@@ -92,20 +65,14 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       unsigned char Buffer[4*1024];
       unsigned long Count;
       
-      Count = read(GzOut[0],Buffer,sizeof(Buffer));
-      if (Count < 0 && errno == EINTR)
-        continue;
-      
-      if (Count < 0)
+      if (!From.Read(Buffer,sizeof(Buffer),&Count))
       {
-        _error->Errno("read", "Read error from %s process",Prog);
-        Failed = true;
-        break;
+        To.OpFail();
+        return false;
       }
-      
       if (Count == 0)
         break;
-      
+
       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
       {
@@ -114,13 +81,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       }      
    }
    
-   // Wait for gzip to finish
-   if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false)
-   {
-      To.OpFail();
-      return false;
-   }  
-       
+   From.Close();
    To.Close();
    
    if (Failed == true)
@@ -129,16 +90,16 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // 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)
-      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 _error->Errno("stat",_("Failed to stat"));
    
    // Return a Done response
    Res.LastModified = Buf.st_mtime;
@@ -153,10 +114,8 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, char *argv[])
 {
-   GzipMethod Mth;
+   setlocale(LC_ALL, "");
 
-   Prog = strrchr(argv[0],'/');
-   Prog++;
-   
+   GzipMethod Mth;
    return Mth.Run();
 }