X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8e5fc8f5bea54e3c016a14fe4025dcb94864e874..bd668fbb93a536135f8a001f98a7485158a5075f:/apt-pkg/acquire-method.cc diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 5b7251a5f..bc29417f7 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -1,12 +1,12 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.cc,v 1.21 1999/10/18 00:37:35 jgg Exp $ +// $Id: acquire-method.cc,v 1.27.2.1 2003/12/24 23:09:17 mdz Exp $ /* ###################################################################### Acquire Method This is a skeleton class that implements most of the functionality - of a method and some usefull functions to make method implementation + 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 @@ -15,19 +15,22 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/acquire-method.h" -#endif #include #include #include #include #include +#include +#include +#include #include #include +#include /*}}}*/ +using namespace std; + // AcqMethod::pkgAcqMethod - Constructor /*{{{*/ // --------------------------------------------------------------------- /* This constructs the initialization text */ @@ -52,6 +55,9 @@ pkgAcqMethod::pkgAcqMethod(const char *Ver,unsigned long Flags) 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)) @@ -81,7 +87,7 @@ 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++) + for (string::iterator I = Err.begin(); I != Err.end(); I++) { if (*I == '\r') *I = ' '; @@ -92,8 +98,9 @@ void pkgAcqMethod::Fail(string Err,bool Transient) 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; @@ -103,8 +110,9 @@ void pkgAcqMethod::Fail(string Err,bool Transient) QueueBack = Queue; } else - snprintf(S,sizeof(S),"400 URI Failure\nURI: \n" - "Message: %s\n",Err.c_str()); + snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: \n" + "Message: %s %s\n",Err.c_str(), + FailExtra.c_str()); // Set the transient flag if (Transient == true) @@ -129,14 +137,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(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) - 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) - 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"); @@ -158,20 +166,32 @@ 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(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) - 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) - 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) - 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()); + End += snprintf(End,sizeof(S)-50 - (End - S),"MD5Sum-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.SHA256Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"SHA256-Hash: %s\n",Res.SHA256Sum.c_str()); + if (Res.GPGVOutput.size() > 0) + End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n"); + for (vector::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) - (End - S),"Resume-Point: %lu\n", + End += snprintf(End,sizeof(S)-50 - (End - S),"Resume-Point: %lu\n", Res.ResumePoint); if (Res.IMSHit == true) @@ -181,18 +201,24 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) 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) - 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) - 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) - 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()); + if (Alt->SHA1Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA1-Hash: %s\n", + Alt->SHA1Sum.c_str()); + if (Alt->SHA256Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA256-Hash: %s\n", + Alt->SHA256Sum.c_str()); if (Alt->IMSHit == true) strcat(End,"Alt-IMS-Hit: true\n"); @@ -256,7 +282,7 @@ bool pkgAcqMethod::MediaFail(string Required,string Drive) MyMessages.erase(MyMessages.begin()); } - return !StringToBool(LookupTag(Message,"Fail"),false); + return !StringToBool(LookupTag(Message,"Failed"),false); } Messages.push_back(Message); @@ -271,10 +297,11 @@ bool pkgAcqMethod::Configuration(string Message) { ::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"); - 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) @@ -282,11 +309,11 @@ bool pkgAcqMethod::Configuration(string Message) I += Length + 1; - for (; I < Message.end() && *I == ' '; I++); + for (; I < MsgEnd && *I == ' '; I++); const char *Equals = I; - for (; Equals < Message.end() && *Equals != '='; Equals++); + for (; Equals < MsgEnd && *Equals != '='; Equals++); const char *End = Equals; - for (; End < Message.end() && *End != '\n'; End++); + for (; End < MsgEnd && *End != '\n'; End++); if (End == Equals) return false; @@ -385,10 +412,10 @@ void pkgAcqMethod::Log(const char *Format,...) // 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()); - 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)) @@ -409,10 +436,10 @@ void pkgAcqMethod::Status(const char *Format,...) // 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()); - 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)) @@ -428,4 +455,14 @@ 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(); + SHA256Sum = Hash.SHA256.Result(); +} + /*}}}*/