Source record file list parsing

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

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 7c3fdecb38204f8bab94b7a8e3396e92ff8f3546..678b10646699aefc2c305673742de701e6f4ffbf 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.cc,v 1.10 1998/12/03 07:29:16 jgg Exp $
+// $Id: acquire-method.cc,v 1.18 1999/03/15 08:10:39 jgg Exp $

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


@@ -14,10 +14,11 @@
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>

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

 #include <apt-pkg/fileutl.h>
 
 #include <stdio.h>
 #include <apt-pkg/fileutl.h>
 
 #include <stdio.h>

+#include <unistd.h>

                                                                        /*}}}*/
 
 // AcqMethod::pkgAcqMethod - Constructor                               /*{{{*/
                                                                        /*}}}*/
 
 // AcqMethod::pkgAcqMethod - Constructor                               /*{{{*/


@@ -47,8 +48,9 @@ pkgAcqMethod::pkgAcqMethod(const char *Ver,unsigned long Flags)
       exit(100);
 
    SetNonBlock(STDIN_FILENO,true);
       exit(100);
 
    SetNonBlock(STDIN_FILENO,true);

-   
+

    Queue = 0;
    Queue = 0;

+   QueueBack = 0;

 }
                                                                        /*}}}*/
 // AcqMethod::Fail - A fetch has failed                                        /*{{{*/
 }
                                                                        /*}}}*/
 // AcqMethod::Fail - A fetch has failed                                        /*{{{*/


@@ -67,7 +69,16 @@ void pkgAcqMethod::Fail(bool Transient)
 // ---------------------------------------------------------------------
 /* */
 void pkgAcqMethod::Fail(string Err,bool Transient)
 // ---------------------------------------------------------------------
 /* */
 void pkgAcqMethod::Fail(string Err,bool Transient)

-{   
+{
+   // Strip out junk from the error messages
+   for (char *I = Err.begin(); I != Err.end(); I++)
+   {
+      if (*I == '\r') 
+        *I = ' ';
+      if (*I == '\n') 
+        *I = ' ';
+   }
+   

    char S[1024];
    if (Queue != 0)
    {
    char S[1024];
    if (Queue != 0)
    {


@@ -78,6 +89,8 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
       FetchItem *Tmp = Queue;
       Queue = Queue->Next;
       delete Tmp;
       FetchItem *Tmp = Queue;
       Queue = Queue->Next;
       delete Tmp;

+      if (Tmp == QueueBack)
+        QueueBack = Queue;

    }
    else
       snprintf(S,sizeof(S),"400 URI Failure\nURI: <UNKNOWN>\n"
    }
    else
       snprintf(S,sizeof(S),"400 URI Failure\nURI: <UNKNOWN>\n"


@@ -145,7 +158,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
                      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),"MD5Sum: %s\n",Res.MD5Sum.c_str());
+      End += snprintf(End,sizeof(S) - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());

 
    if (Res.ResumePoint != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",
 
    if (Res.ResumePoint != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",


@@ -168,7 +181,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
                         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-MD5Sum: %s\n",
+        End += snprintf(End,sizeof(S) - (End - S),"Alt-MD5-Hash: %s\n",

                         Alt->MD5Sum.c_str());
       
       if (Alt->IMSHit == true)
                         Alt->MD5Sum.c_str());
       
       if (Alt->IMSHit == true)


@@ -183,13 +196,15 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
    FetchItem *Tmp = Queue;
    Queue = Queue->Next;
    delete Tmp;
    FetchItem *Tmp = Queue;
    Queue = Queue->Next;
    delete Tmp;

+   if (Tmp == QueueBack)
+      QueueBack = Queue;

 }
                                                                        /*}}}*/
 // AcqMethod::MediaFail - Syncronous request for new media             /*{{{*/
 // ---------------------------------------------------------------------
 /* This sends a 403 Media Failure message to the APT and waits for it
    to be ackd */
 }
                                                                        /*}}}*/
 // AcqMethod::MediaFail - Syncronous request for new media             /*{{{*/
 // ---------------------------------------------------------------------
 /* This sends a 403 Media Failure message to the APT and waits for it
    to be ackd */

-void pkgAcqMethod::MediaFail(string Required,string Drive)
+bool pkgAcqMethod::MediaFail(string Required,string Drive)

 {
    char S[1024];
    snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n",
 {
    char S[1024];
    snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n",


@@ -205,11 +220,11 @@ void pkgAcqMethod::MediaFail(string Required,string Drive)
    while (1)
    {
       if (WaitFd(STDIN_FILENO) == false)
    while (1)
    {
       if (WaitFd(STDIN_FILENO) == false)

-        exit(0);
+        return false;

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

-        exit(0);
-      
+        return false;
+

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


@@ -225,13 +240,13 @@ void pkgAcqMethod::MediaFail(string Required,string Drive)
       // Change ack
       if (Number == 603)
       {
       // Change ack
       if (Number == 603)
       {

-        while (Message.empty() == false)
+        while (MyMessages.empty() == false)

         {
            Messages.push_back(MyMessages.front());
            MyMessages.erase(MyMessages.begin());
         }
         {
            Messages.push_back(MyMessages.front());
            MyMessages.erase(MyMessages.begin());
         }

-        
-        return;
+
+        return !StringToBool(LookupTag(Message,"Fail"),false);

       }
       
       Messages.push_back(Message);
       }
       
       Messages.push_back(Message);


@@ -265,7 +280,8 @@ bool pkgAcqMethod::Configuration(string Message)
       if (End == Equals)
         return false;
       
       if (End == Equals)
         return false;
       

-      Cnf.Set(string(I,Equals-I),string(Equals+1,End-Equals-1));
+      Cnf.Set(DeQuoteString(string(I,Equals-I)),
+             DeQuoteString(string(Equals+1,End-Equals-1)));

       I = End;
    }
    
       I = End;
    }
    


@@ -328,7 +344,9 @@ int pkgAcqMethod::Run(bool Single)
            FetchItem **I = &Queue;
            for (; *I != 0; I = &(*I)->Next);
            *I = Tmp;
            FetchItem **I = &Queue;
            for (; *I != 0; I = &(*I)->Next);
            *I = Tmp;

-
+           if (QueueBack == 0)
+              QueueBack = Tmp;
+           

            // Notify that this item is to be fetched.
            if (Fetch(Tmp) == false)
               Fail();
            // Notify that this item is to be fetched.
            if (Fetch(Tmp) == false)
               Fail();