X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5cb5d8dc4318227ca3ec8976f67e8cfd2302d1ff..7974b907ac33f2a5d7c7ad75c0cb13166f642ec1:/apt-pkg/acquire-method.cc?ds=inline

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 8b1de6fb3..678b10646 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: acquire-method.cc,v 1.14 1998/12/05 04:19:01 jgg Exp $
+// $Id: acquire-method.cc,v 1.18 1999/03/15 08:10:39 jgg Exp $
 /* ######################################################################
 
    Acquire Method
@@ -14,10 +14,11 @@
 #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 <unistd.h>
 									/*}}}*/
 
 // AcqMethod::pkgAcqMethod - Constructor				/*{{{*/
@@ -68,7 +69,16 @@ void pkgAcqMethod::Fail(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)
    {
@@ -148,7 +158,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
 		      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",
@@ -171,7 +181,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
 			 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)
@@ -270,7 +280,8 @@ bool pkgAcqMethod::Configuration(string Message)
       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;
    }