X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/93bf083d699c60f1ac40297bfa6783fb0cb800d8..84b286f65c55e21b4734a17474f1cba464cbbd9c:/methods/gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index acba7fc52..7ffcda60f 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: gzip.cc,v 1.3 1998/10/30 07:53: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 
@@ -9,102 +9,138 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>
+#include <config.h>
+
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/acquire-method.h>
-#include <strutl.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/aptconfiguration.h>
 
+#include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <utime.h>
-#include <wait.h>
-#include <stdio.h>
+#include <sys/time.h>
+#include <string>
+#include <vector>
+
+#include <apti18n.h>
 									/*}}}*/
 
+const char *Prog;
+
 class GzipMethod : public pkgAcqMethod
 {
-   virtual bool Fetch(string Message,URI Get);
+   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(string Message,URI Get)
+bool GzipMethod::Fetch(FetchItem *Itm)
 {
-   // Open the source and destintation files
-   FileFd From(Get.Path,FileFd::ReadOnly);
-   FileFd To(DestFile,FileFd::WriteEmpty);   
-   To.EraseOnFailure();
-   if (_error->PendingError() == true)
-      return false;
+   URI Get = Itm->Uri;
+   std::string Path = Get.Host + Get.Path; // To account for relative paths
    
-   // Fork gzip
-   int Process = fork();
-   if (Process < 0)
-      return _error->Errno("fork","Couldn't fork gzip");
-   
-   // The child
-   if (Process == 0)
+   FetchResult Res;
+   Res.Filename = Itm->DestFile;
+   URIStart(Res);
+
+   std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+   std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
+   for (; compressor != compressors.end(); ++compressor)
+      if (compressor->Name == Prog)
+	 break;
+   if (compressor == compressors.end())
+      return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog);
+
+   // Open the source and destination files
+   FileFd From, To;
+   if (_config->FindB("Method::Compress", false) == false)
    {
-      dup2(From.Fd(),STDIN_FILENO);
-      dup2(To.Fd(),STDOUT_FILENO);
-      From.Close();
-      To.Close();
-      SetCloseExec(STDIN_FILENO,false);
-      SetCloseExec(STDOUT_FILENO,false);
-      
-      const char *Args[3];
-      Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
-      Args[1] = "-d";
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
-      exit(100);
+      From.Open(Path, FileFd::ReadOnly, *compressor);
+      if(From.FileSize() == 0)
+	 return _error->Error(_("Empty files can't be valid archives"));
+      To.Open(Itm->DestFile, FileFd::WriteAtomic);
    }
-   From.Close();
-   
-   // Wait for gzip to finish
-   int Status;
-   if (waitpid(Process,&Status,0) != Process)
+   else
    {
-      To.OpFail();
-      return _error->Errno("wait","Waiting for gzip failed");
-   }	 
-   
-   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
+      From.Open(Path, FileFd::ReadOnly);
+      To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor);
+   }
+   To.EraseOnFailure();
+
+   if (From.IsOpen() == false || From.Failed() == true ||
+	 To.IsOpen() == false || To.Failed() == true)
+      return false;
+
+   // Read data from source, generate checksums and write
+   Hashes Hash;
+   bool Failed = false;
+   while (1) 
    {
-      To.OpFail();
-      return _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong.");
-   }	 
+      unsigned char Buffer[4*1024];
+      unsigned long long Count = 0;
+      
+      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();
+   Res.Size = To.FileSize();
    To.Close();
-   
+
+   if (Failed == true)
+      return false;
+
    // 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(DestFile.c_str(),&TimeBuf) != 0)
-      return _error->Errno("utime","Failed to set modification time");
+   struct timeval times[2];
+   times[0].tv_sec = Buf.st_atime;
+   Res.LastModified = times[1].tv_sec = Buf.st_mtime;
+   times[0].tv_usec = times[1].tv_usec = 0;
+   if (utimes(Itm->DestFile.c_str(), times) != 0)
+      return _error->Errno("utimes",_("Failed to set modification time"));
 
    // Return a Done response
-   FetchResult Res;
-   Res.LastModified = Buf.st_mtime;
-   Res.Filename = DestFile;
+   Res.TakeHashes(Hash);
+
    URIDone(Res);
-   
    return true;
 }
 									/*}}}*/
 
-int main()
+int main(int, char *argv[])
 {
+   setlocale(LC_ALL, "");
+
+   Prog = strrchr(argv[0],'/');
+   ++Prog;
+
    GzipMethod Mth;
+
+   Mth.DropPrivsOrDie();
+
    return Mth.Run();
 }