* wording fixes (cherry picked from apt--mvo)

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

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 0ecd8df934568d9cfb3810ca424ae766d588ee26..41b832f3babe7fc106caec319ed6daf35e39e7f6 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.26 2001/03/13 06:51:46 jgg Exp $
+// $Id: acquire-method.cc,v 1.27.2.1 2003/12/24 23:09:17 mdz Exp $

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


@@ -24,12 +24,16 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.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 <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>

+#include <sys/signal.h>

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

+using namespace std;
+

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


@@ -86,7 +90,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 = ' ';


@@ -178,6 +182,11 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
       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());
       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.GPGVOutput.size() > 0)
+      End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n");     
+   for (vector<string>::iterator I = Res.GPGVOutput.begin();
+      I != Res.GPGVOutput.end(); I++)
+      End += snprintf(End,sizeof(S)-50 - (End - S), " %s\n", (*I).c_str());

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


@@ -268,7 +277,7 @@ bool pkgAcqMethod::MediaFail(string Required,string Drive)
            MyMessages.erase(MyMessages.begin());
         }
 
            MyMessages.erase(MyMessages.begin());
         }
 

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

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


@@ -283,10 +292,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)


@@ -294,11 +304,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;