Fix typo

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 15bff4d839c7fd8f42df050797e0402547b4a5ec..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.1 1998/10/25 07:07: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 
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 


@@ -11,169 +11,163 @@
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/configuration.h>
-#include <apt-pkg/acquire-worker.h>
-#include <strutl.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>

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

-// Fail - Generate a failure message                                   /*{{{*/
+const char *Prog;
+
+class GzipMethod : public pkgAcqMethod
+{
+   virtual bool Fetch(FetchItem *Itm);
+   
+   public:
+   
+   GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
+};
+
+
+// GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-void Fail(string URI)
+bool GzipMethod::Fetch(FetchItem *Itm)

 {
 {

-   string Err = "Undetermined Error";
-   if (_error->empty() == false)
-      _error->PopMessage(Err);
+   URI Get = Itm->Uri;
+   string Path = Get.Host + Get.Path; // To account for relative paths

    
    

-   printf("400 URI Failure\n"
-         "URI: %s\n"
-         "Message: %s\n\n",URI.c_str(),Err.c_str());
-   _error->Discard();
-}
-                                                                       /*}}}*/
+   string GzPathOption = "Dir::bin::"+string(Prog);

 
 

-int main()
-{
-   setlinebuf(stdout);
-   SetNonBlock(STDIN_FILENO,true);
+   FetchResult Res;
+   Res.Filename = Itm->DestFile;
+   URIStart(Res);

    
    

-   printf("100 Capabilities\n"
-         "Version: 1.0\n"
-         "Pipeline: true\n"
-         "Send-Config: true\n\n");
+   // Open the source and destination files
+   FileFd From(Path,FileFd::ReadOnly);

 
 

-   vector<string> Messages;   
-   while (1)
+   // if the file is empty, just rename it and return
+   if(From.Size() == 0) 

    {
    {

-      if (WaitFd(STDIN_FILENO) == false ||
-         ReadMessages(STDIN_FILENO,Messages) == false)
-        return 0;
+      rename(Path.c_str(), Itm->DestFile.c_str());
+      return true;
+   }

 
 

-      while (Messages.empty() == false)
+   int GzOut[2];   
+   if (pipe(GzOut) < 0)
+      return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
+
+   // 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);   
+   To.EraseOnFailure();
+   if (_error->PendingError() == true)
+      return false;
+   
+   // Read data from gzip, generate checksums and write
+   Hashes Hash;
+   bool Failed = false;
+   while (1) 
+   {
+      unsigned char Buffer[4*1024];
+      unsigned long Count;
+      
+      Count = read(GzOut[0],Buffer,sizeof(Buffer));
+      if (Count < 0 && errno == EINTR)
+        continue;
+      
+      if (Count < 0)

       {
       {

-        string Message = Messages.front();
-        Messages.erase(Messages.begin());
-        
-        // Fetch the message number
-        char *End;
-        int Number = strtol(Message.c_str(),&End,10);
-        if (End == Message.c_str())
-        {
-           cerr << "Malformed message!" << endl;
-           return 100;
-        }
-        
-        // 601 configuration message
-        if (Number == 601)
-        {
-           pkgInjectConfiguration(Message,*_config);
-           continue;
-        }       
-
-        // 600 URI Fetch message
-        if (Number != 600)
-           continue;
-        
-        // Grab the URI bit 
-        string URI = LookupTag(Message,"URI");
-        string Target = LookupTag(Message,"Filename");
-        
-        // Grab the filename
-        string::size_type Pos = URI.find(':');
-        if (Pos == string::npos)
-        {
-           _error->Error("Invalid message");
-           Fail(URI);
-           continue;
-        }
-        string File = string(URI,Pos+1);
-        
-        // Start the reply message
-        string Result = "201 URI Done";
-        Result += "\nURI: " + URI;
-        Result += "\nFileName: " + Target;
-        
-        // See if the file exists
-        FileFd From(File,FileFd::ReadOnly);
-        FileFd To(Target,FileFd::WriteEmpty);
-        To.EraseOnFailure();
-        if (_error->PendingError() == true)
-        {
-           Fail(URI);
-           continue;
-        }       
-        
-        // Fork gzip
-        int Process = fork();
-        if (Process < 0)
-        {
-           _error->Errno("fork","Couldn't fork gzip");
-           Fail(URI);
-           continue;
-        }
-        
-        // The child
-        if (Process == 0)
-        {
-           dup2(From.Fd(),STDIN_FILENO);
-           dup2(To.Fd(),STDOUT_FILENO);
-           
-           const char *Args[3];
-           Args[0] = _config->FindFile("Dir::bin::gzip","gzip").c_str();
-           Args[1] = "-d";
-           Args[2] = 0;
-           execvp(Args[0],(char **)Args);
-        }
-        From.Close();
-        To.Close();
-        
-        // Wait for gzip to finish
-        int Status;
-        if (waitpid(Process,&Status,0) != Process)
-        {
-           _error->Errno("wait","Waiting for gzip failed");
-           Fail(URI);
-           continue;
-        }       
-
-        if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
-        {
-           _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong.");
-           Fail(URI);
-           continue;
-        }       
-        
-        // Transfer the modification times
-        struct stat Buf;
-        if (stat(File.c_str(),&Buf) != 0)
-        {
-           _error->Errno("stat","Failed to stat");
-           Fail(URI);
-           continue;
-        }
-        struct utimbuf TimeBuf;
-        TimeBuf.actime = Buf.st_atime;
-        TimeBuf.modtime = Buf.st_mtime;
-        if (utime(Target.c_str(),&TimeBuf) != 0)
-        {
-           _error->Errno("utime","Failed to set modification time");
-           Fail(URI);
-           continue;
-        }
-        
-        // Send the message
-        Result += "\n\n";
-        if (write(STDOUT_FILENO,Result.begin(),Result.length()) != 
-            (signed)Result.length())
-           return 100;
+        _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;

       }      
    }
    
       }      
    }
    

-   return 0;
+   // Wait for gzip to finish
+   if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false)
+   {
+      To.OpFail();
+      return false;
+   }  
+       
+   To.Close();
+   
+   if (Failed == true)
+      return false;
+   
+   // Transfer the modification times
+   struct stat Buf;
+   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)
+      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;
+   Res.Size = Buf.st_size;
+   Res.TakeHashes(Hash);
+
+   URIDone(Res);
+   
+   return true;
+}
+                                                                       /*}}}*/
+
+int main(int argc, char *argv[])
+{
+   setlocale(LC_ALL, "");
+
+   GzipMethod Mth;
+
+   Prog = strrchr(argv[0],'/');
+   Prog++;
+   
+   return Mth.Run();

 }
 }