merged from lp:~donkult/apt/sid

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index a8e816bf34b9b31b843fdc53d8a3c8d7bd399f37..fc4e1ecfd68c93cb9824ac74a7a6a3d2eadd662d 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -23,8 +23,6 @@
 #include <apti18n.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);


@@ -43,56 +41,22 @@ 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 GzPathOption = "Dir::bin::"+string(Prog);
-

    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);
    
    // Open the source and destination files
    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);
    
    // 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, Itm->DestFile);
-      return true;
-   }
+   FileFd From(Path,FileFd::ReadOnlyGzip);

 
 

-   int GzOut[2];   
-   if (pipe(GzOut) < 0)
-      return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
+   if(From.FileSize() == 0)
+      return _error->Error(_("Empty files can't be valid archives"));

 
 

-   // Fork gzip
-   pid_t 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;
    
    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) 
    Hashes Hash;
    bool Failed = false;
    while (1) 


@@ -100,36 +64,23 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       unsigned char Buffer[4*1024];
       unsigned long Count;
       
       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;
       if (Count == 0)
         break;

-      
+

       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
       {
         Failed = true;
       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
       {
         Failed = true;

-        FromGz.Close();

         break;
       }      
    }
    
         break;
       }      
    }
    

-   // 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)
    To.Close();
    
    if (Failed == true)


@@ -165,9 +116,5 @@ int main(int argc, char *argv[])
    setlocale(LC_ALL, "");
 
    GzipMethod Mth;
    setlocale(LC_ALL, "");
 
    GzipMethod Mth;

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

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