Open 0.5.32

[apt.git] / apt-pkg / acquire-method.cc

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 4b1642a3f74415e7c8bfd852735ac7c72eef2911..df8628916603bbdc0a36e8bfc4d3089de95afaf5 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,10 +1,17 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.cc,v 1.19 1999/04/15 02:43:47 jgg Exp $
+// $Id: acquire-method.cc,v 1.27 2001/05/22 04:27:11 jgg Exp $

 /* ######################################################################
 
    Acquire Method
 
 /* ######################################################################
 
    Acquire Method
 

+   This is a skeleton class that implements most of the functionality
+   of a method and some useful functions to make method implementation
+   simpler. The methods all derive this and specialize it. The most
+   complex implementation is the http method which needs to provide
+   pipelining, it runs the message engine at the same time it is 
+   downloading files..
+   

    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/


@@ -16,11 +23,16 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/hashes.h>

 
 

+#include <iostream>
+#include <stdarg.h>

 #include <stdio.h>
 #include <unistd.h>
                                                                        /*}}}*/
 
 #include <stdio.h>
 #include <unistd.h>
                                                                        /*}}}*/
 

+using namespace std;
+

 // AcqMethod::pkgAcqMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This constructs the initialization text */
 // AcqMethod::pkgAcqMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This constructs the initialization text */


@@ -42,6 +54,12 @@ pkgAcqMethod::pkgAcqMethod(const char *Ver,unsigned long Flags)
 
    if ((Flags & LocalOnly) == LocalOnly)
       strcat(End,"Local-Only: true\n");
 
    if ((Flags & LocalOnly) == LocalOnly)
       strcat(End,"Local-Only: true\n");

+
+   if ((Flags & NeedsCleanup) == NeedsCleanup)
+      strcat(End,"Needs-Cleanup: true\n");
+
+   if ((Flags & Removable) == Removable)
+      strcat(End,"Removable: true\n");

    strcat(End,"\n");
 
    if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
    strcat(End,"\n");
 
    if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))


@@ -71,7 +89,7 @@ void pkgAcqMethod::Fail(bool Transient)
 void pkgAcqMethod::Fail(string Err,bool Transient)
 {
    // Strip out junk from the error messages
 void pkgAcqMethod::Fail(string Err,bool Transient)
 {
    // Strip out junk from the error messages

-   for (char *I = Err.begin(); I != Err.end(); I++)
+   for (string::iterator I = Err.begin(); I != Err.end(); I++)

    {
       if (*I == '\r') 
         *I = ' ';
    {
       if (*I == '\r') 
         *I = ' ';


@@ -82,8 +100,9 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
    char S[1024];
    if (Queue != 0)
    {
    char S[1024];
    if (Queue != 0)
    {

-      snprintf(S,sizeof(S),"400 URI Failure\nURI: %s\n"
-              "Message: %s\n",Queue->Uri.c_str(),Err.c_str());
+      snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n"
+              "Message: %s %s\n",Queue->Uri.c_str(),Err.c_str(),
+              FailExtra.c_str());

 
       // Dequeue
       FetchItem *Tmp = Queue;
 
       // Dequeue
       FetchItem *Tmp = Queue;


@@ -93,8 +112,9 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
         QueueBack = Queue;
    }
    else
         QueueBack = Queue;
    }
    else

-      snprintf(S,sizeof(S),"400 URI Failure\nURI: <UNKNOWN>\n"
-              "Message: %s\n",Err.c_str());
+      snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: <UNKNOWN>\n"
+              "Message: %s %s\n",Err.c_str(),
+              FailExtra.c_str());

       
    // Set the transient flag 
    if (Transient == true)
       
    // Set the transient flag 
    if (Transient == true)


@@ -119,14 +139,14 @@ void pkgAcqMethod::URIStart(FetchResult &Res)
    
    End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str());
    if (Res.Size != 0)
    
    End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str());
    if (Res.Size != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);
+      End += snprintf(End,sizeof(S)-4 - (End - S),"Size: %lu\n",Res.Size);

    
    if (Res.LastModified != 0)
    
    if (Res.LastModified != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
+      End += snprintf(End,sizeof(S)-4 - (End - S),"Last-Modified: %s\n",

                      TimeRFC1123(Res.LastModified).c_str());
    
    if (Res.ResumePoint != 0)
                      TimeRFC1123(Res.LastModified).c_str());
    
    if (Res.ResumePoint != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",
+      End += snprintf(End,sizeof(S)-4 - (End - S),"Resume-Point: %lu\n",

                      Res.ResumePoint);
       
    strcat(End,"\n");
                      Res.ResumePoint);
       
    strcat(End,"\n");


@@ -148,20 +168,22 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
    End += snprintf(S,sizeof(S),"201 URI Done\nURI: %s\n",Queue->Uri.c_str());
 
    if (Res.Filename.empty() == false)
    End += snprintf(S,sizeof(S),"201 URI Done\nURI: %s\n",Queue->Uri.c_str());
 
    if (Res.Filename.empty() == false)

-      End += snprintf(End,sizeof(S) - (End - S),"Filename: %s\n",Res.Filename.c_str());
+      End += snprintf(End,sizeof(S)-50 - (End - S),"Filename: %s\n",Res.Filename.c_str());

    
    if (Res.Size != 0)
    
    if (Res.Size != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);
+      End += snprintf(End,sizeof(S)-50 - (End - S),"Size: %lu\n",Res.Size);

    
    if (Res.LastModified != 0)
    
    if (Res.LastModified != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
+      End += snprintf(End,sizeof(S)-50 - (End - S),"Last-Modified: %s\n",

                      TimeRFC1123(Res.LastModified).c_str());
 
    if (Res.MD5Sum.empty() == false)
                      TimeRFC1123(Res.LastModified).c_str());
 
    if (Res.MD5Sum.empty() == false)

-      End += snprintf(End,sizeof(S) - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
+      End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
+   if (Res.SHA1Sum.empty() == false)
+      End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str());

 
    if (Res.ResumePoint != 0)
 
    if (Res.ResumePoint != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",
+      End += snprintf(End,sizeof(S)-50 - (End - S),"Resume-Point: %lu\n",

                      Res.ResumePoint);
 
    if (Res.IMSHit == true)
                      Res.ResumePoint);
 
    if (Res.IMSHit == true)


@@ -171,18 +193,21 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
    if (Alt != 0)
    {
       if (Alt->Filename.empty() == false)
    if (Alt != 0)
    {
       if (Alt->Filename.empty() == false)

-        End += snprintf(End,sizeof(S) - (End - S),"Alt-Filename: %s\n",Alt->Filename.c_str());
+        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-Filename: %s\n",Alt->Filename.c_str());

       
       if (Alt->Size != 0)
       
       if (Alt->Size != 0)

-        End += snprintf(End,sizeof(S) - (End - S),"Alt-Size: %lu\n",Alt->Size);
+        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-Size: %lu\n",Alt->Size);

       
       if (Alt->LastModified != 0)
       
       if (Alt->LastModified != 0)

-        End += snprintf(End,sizeof(S) - (End - S),"Alt-Last-Modified: %s\n",
+        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-Last-Modified: %s\n",

                         TimeRFC1123(Alt->LastModified).c_str());
       
       if (Alt->MD5Sum.empty() == false)
                         TimeRFC1123(Alt->LastModified).c_str());
       
       if (Alt->MD5Sum.empty() == false)

-        End += snprintf(End,sizeof(S) - (End - S),"Alt-MD5-Hash: %s\n",
+        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-MD5-Hash: %s\n",

                         Alt->MD5Sum.c_str());
                         Alt->MD5Sum.c_str());

+      if (Alt->SHA1Sum.empty() == false)
+        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA1-Hash: %s\n",
+                        Alt->SHA1Sum.c_str());

       
       if (Alt->IMSHit == true)
         strcat(End,"Alt-IMS-Hit: true\n");
       
       if (Alt->IMSHit == true)
         strcat(End,"Alt-IMS-Hit: true\n");


@@ -261,10 +286,11 @@ bool pkgAcqMethod::Configuration(string Message)
 {
    ::Configuration &Cnf = *_config;
    
 {
    ::Configuration &Cnf = *_config;
    

-   const char *I = Message.begin();
+   const char *I = Message.c_str();
+   const char *MsgEnd = I + Message.length();

    
    unsigned int Length = strlen("Config-Item");
    
    unsigned int Length = strlen("Config-Item");

-   for (; I + Length < Message.end(); I++)
+   for (; I + Length < MsgEnd; I++)

    {
       // Not a config item
       if (I[Length] != ':' || stringcasecmp(I,I+Length,"Config-Item") != 0)
    {
       // Not a config item
       if (I[Length] != ':' || stringcasecmp(I,I+Length,"Config-Item") != 0)


@@ -272,11 +298,11 @@ bool pkgAcqMethod::Configuration(string Message)
       
       I += Length + 1;
       
       
       I += Length + 1;
       

-      for (; I < Message.end() && *I == ' '; I++);
+      for (; I < MsgEnd && *I == ' '; I++);

       const char *Equals = I;
       const char *Equals = I;

-      for (; Equals < Message.end() && *Equals != '='; Equals++);
+      for (; Equals < MsgEnd && *Equals != '='; Equals++);

       const char *End = Equals;
       const char *End = Equals;

-      for (; End < Message.end() && *End != '\n'; End++);
+      for (; End < MsgEnd && *End != '\n'; End++);

       if (End == Equals)
         return false;
       
       if (End == Equals)
         return false;
       


@@ -290,7 +316,9 @@ bool pkgAcqMethod::Configuration(string Message)
                                                                        /*}}}*/
 // AcqMethod::Run - Run the message engine                             /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // AcqMethod::Run - Run the message engine                             /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* Fetch any messages and execute them. In single mode it returns 1 if
+   there are no more available messages - any other result is a 
+   fatal failure code! */

 int pkgAcqMethod::Run(bool Single)
 {
    while (1)
 int pkgAcqMethod::Run(bool Single)
 {
    while (1)


@@ -300,15 +328,14 @@ int pkgAcqMethod::Run(bool Single)
       {
         if (Single == false)
            if (WaitFd(STDIN_FILENO) == false)
       {
         if (Single == false)
            if (WaitFd(STDIN_FILENO) == false)

-              return 0;
-      
+              break;

         if (ReadMessages(STDIN_FILENO,Messages) == false)
         if (ReadMessages(STDIN_FILENO,Messages) == false)

-           return 0;
+           break;

       }
             
       // Single mode exits if the message queue is empty
       if (Single == true && Messages.empty() == true)
       }
             
       // Single mode exits if the message queue is empty
       if (Single == true && Messages.empty() == true)

-        return 0;
+        return -1;

       
       string Message = Messages.front();
       Messages.erase(Messages.begin());
       
       string Message = Messages.front();
       Messages.erase(Messages.begin());


@@ -323,7 +350,7 @@ int pkgAcqMethod::Run(bool Single)
       }
 
       switch (Number)
       }
 
       switch (Number)

-      {
+      {         

         case 601:
         if (Configuration(Message) == false)
            return 100;
         case 601:
         if (Configuration(Message) == false)
            return 100;


@@ -356,6 +383,7 @@ int pkgAcqMethod::Run(bool Single)
       }      
    }
 
       }      
    }
 

+   Exit();

    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/


@@ -373,10 +401,10 @@ void pkgAcqMethod::Log(const char *Format,...)
 
    // sprintf the description
    char S[1024];
 
    // sprintf the description
    char S[1024];

-   unsigned int Len = snprintf(S,sizeof(S),"101 Log\nURI: %s\n"
+   unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\nURI: %s\n"

                               "Message: ",CurrentURI.c_str());
 
                               "Message: ",CurrentURI.c_str());
 

-   vsnprintf(S+Len,sizeof(S)-Len,Format,args);
+   vsnprintf(S+Len,sizeof(S)-4-Len,Format,args);

    strcat(S,"\n\n");
    
    if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
    strcat(S,"\n\n");
    
    if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))


@@ -397,10 +425,10 @@ void pkgAcqMethod::Status(const char *Format,...)
 
    // sprintf the description
    char S[1024];
 
    // sprintf the description
    char S[1024];

-   unsigned int Len = snprintf(S,sizeof(S),"102 Status\nURI: %s\n"
+   unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\nURI: %s\n"

                               "Message: ",CurrentURI.c_str());
 
                               "Message: ",CurrentURI.c_str());
 

-   vsnprintf(S+Len,sizeof(S)-Len,Format,args);
+   vsnprintf(S+Len,sizeof(S)-4-Len,Format,args);

    strcat(S,"\n\n");
    
    if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
    strcat(S,"\n\n");
    
    if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))


@@ -416,4 +444,13 @@ pkgAcqMethod::FetchResult::FetchResult() : LastModified(0),
 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/

-
+// AcqMethod::FetchResult::TakeHashes - Load hashes                    /*{{{*/
+// ---------------------------------------------------------------------
+/* This hides the number of hashes we are supporting from the caller. 
+   It just deals with the hash class. */
+void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash)
+{
+   MD5Sum = Hash.MD5.Result();
+   SHA1Sum = Hash.SHA1.Result();
+}
+                                                                       /*}}}*/