X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/93bf083d699c60f1ac40297bfa6783fb0cb800d8..7d8afa391c5cd04e797a2b41fe3b946631254995:/apt-pkg/acquire-method.cc diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index bd7dd6779..7f0119819 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.1 1998/10/30 07:53:35 jgg Exp $ +// $Id: acquire-method.cc,v 1.16 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Acquire Method @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -33,41 +33,65 @@ pkgAcqMethod::pkgAcqMethod(const char *Ver,unsigned long Flags) if ((Flags & SingleInstance) == SingleInstance) strcat(End,"Single-Instance: true\n"); - if ((Flags & PreScan) == PreScan) - strcat(End,"Pre-Scan: true\n"); - if ((Flags & Pipeline) == Pipeline) strcat(End,"Pipeline: true\n"); if ((Flags & SendConfig) == SendConfig) strcat(End,"Send-Config: true\n"); + + if ((Flags & LocalOnly) == LocalOnly) + strcat(End,"Local-Only: true\n"); strcat(End,"\n"); if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) exit(100); + + SetNonBlock(STDIN_FILENO,true); + + Queue = 0; + QueueBack = 0; } /*}}}*/ // AcqMethod::Fail - A fetch has failed /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqMethod::Fail() +void pkgAcqMethod::Fail(bool Transient) { string Err = "Undetermined Error"; if (_error->empty() == false) _error->PopMessage(Err); _error->Discard(); - Fail(Err); + Fail(Err,Transient); } /*}}}*/ // AcqMethod::Fail - A fetch has failed /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqMethod::Fail(string Err) +void pkgAcqMethod::Fail(string Err,bool Transient) { char S[1024]; - snprintf(S,sizeof(S),"400 URI Failure\nURI: %s\n" - "Message %s\n\n",CurrentURI.c_str(),Err.c_str()); + if (Queue != 0) + { + snprintf(S,sizeof(S),"400 URI Failure\nURI: %s\n" + "Message: %s\n",Queue->Uri.c_str(),Err.c_str()); + // Dequeue + FetchItem *Tmp = Queue; + Queue = Queue->Next; + delete Tmp; + if (Tmp == QueueBack) + QueueBack = Queue; + } + else + snprintf(S,sizeof(S),"400 URI Failure\nURI: \n" + "Message: %s\n",Err.c_str()); + + // Set the transient flag + if (Transient == true) + strcat(S,"Transient-Failure: true\n\n"); + else + strcat(S,"\n"); + if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) exit(100); } @@ -75,12 +99,15 @@ void pkgAcqMethod::Fail(string Err) // AcqMethod::URIStart - Indicate a download is starting /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqMethod::URIStart(FetchResult &Res,unsigned long Resume = 0) +void pkgAcqMethod::URIStart(FetchResult &Res) { + if (Queue == 0) + abort(); + char S[1024] = ""; char *End = S; - End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",CurrentURI.c_str()); + 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: %u\n",Res.Size); @@ -88,9 +115,9 @@ void pkgAcqMethod::URIStart(FetchResult &Res,unsigned long Resume = 0) End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n", TimeRFC1123(Res.LastModified).c_str()); - if (Resume != 0) + if (Res.ResumePoint != 0) End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n", - Resume); + Res.ResumePoint); strcat(End,"\n"); if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) @@ -102,10 +129,13 @@ void pkgAcqMethod::URIStart(FetchResult &Res,unsigned long Resume = 0) /* */ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) { + if (Queue == 0) + abort(); + char S[1024] = ""; char *End = S; - End += snprintf(S,sizeof(S),"201 URI Done\nURI: %s\n",CurrentURI.c_str()); + 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()); @@ -118,7 +148,11 @@ 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", + Res.ResumePoint); if (Res.IMSHit == true) strcat(End,"IMS-Hit: true\n"); @@ -137,7 +171,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) @@ -147,6 +181,66 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) strcat(End,"\n"); if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) exit(100); + + // Dequeue + 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 */ +bool pkgAcqMethod::MediaFail(string Required,string Drive) +{ + char S[1024]; + snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n", + Required.c_str(),Drive.c_str()); + + if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) + exit(100); + + vector MyMessages; + + /* Here we read messages until we find a 603, each non 603 message is + appended to the main message list for later processing */ + while (1) + { + if (WaitFd(STDIN_FILENO) == false) + return false; + + if (ReadMessages(STDIN_FILENO,MyMessages) == false) + return false; + + string Message = MyMessages.front(); + MyMessages.erase(MyMessages.begin()); + + // Fetch the message number + char *End; + int Number = strtol(Message.c_str(),&End,10); + if (End == Message.c_str()) + { + cerr << "Malformed message!" << endl; + exit(100); + } + + // Change ack + if (Number == 603) + { + while (MyMessages.empty() == false) + { + Messages.push_back(MyMessages.front()); + MyMessages.erase(MyMessages.begin()); + } + + return !StringToBool(LookupTag(Message,"Fail"),false); + } + + Messages.push_back(Message); + } } /*}}}*/ // AcqMethod::Configuration - Handle the configuration message /*{{{*/ @@ -186,19 +280,25 @@ bool pkgAcqMethod::Configuration(string Message) // AcqMethod::Run - Run the message engine /*{{{*/ // --------------------------------------------------------------------- /* */ -int pkgAcqMethod::Run() +int pkgAcqMethod::Run(bool Single) { - SetNonBlock(STDIN_FILENO,true); - while (1) { + // Block if the message queue is empty if (Messages.empty() == true) - if (WaitFd(STDIN_FILENO) == false) - return 0; + { + if (Single == false) + if (WaitFd(STDIN_FILENO) == false) + return 0; - if (ReadMessages(STDIN_FILENO,Messages) == false) + if (ReadMessages(STDIN_FILENO,Messages) == false) + return 0; + } + + // Single mode exits if the message queue is empty + if (Single == true && Messages.empty() == true) return 0; - + string Message = Messages.front(); Messages.erase(Messages.begin()); @@ -219,13 +319,27 @@ int pkgAcqMethod::Run() break; case 600: - { - CurrentURI = LookupTag(Message,"URI"); - DestFile = LookupTag(Message,"FileName"); - StrToTime(LookupTag(Message,"Last-Modified"),LastModified); - - if (Fetch(Message,CurrentURI) == false) + { + FetchItem *Tmp = new FetchItem; + + Tmp->Uri = LookupTag(Message,"URI"); + Tmp->DestFile = LookupTag(Message,"FileName"); + if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false) + Tmp->LastModified = 0; + Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); + Tmp->Next = 0; + + // Append it to the list + 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(); + break; } } @@ -234,11 +348,60 @@ int pkgAcqMethod::Run() return 0; } /*}}}*/ +// AcqMethod::Log - Send a log message /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqMethod::Log(const char *Format,...) +{ + string CurrentURI = ""; + if (Queue != 0) + CurrentURI = Queue->Uri; + + va_list args; + va_start(args,Format); + + // sprintf the description + char S[1024]; + unsigned int Len = snprintf(S,sizeof(S),"101 Log\nURI: %s\n" + "Message: ",CurrentURI.c_str()); + + vsnprintf(S+Len,sizeof(S)-Len,Format,args); + strcat(S,"\n\n"); + + if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) + exit(100); +} + /*}}}*/ +// AcqMethod::Status - Send a status message /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqMethod::Status(const char *Format,...) +{ + string CurrentURI = ""; + if (Queue != 0) + CurrentURI = Queue->Uri; + + va_list args; + va_start(args,Format); + + // sprintf the description + char S[1024]; + unsigned int Len = snprintf(S,sizeof(S),"102 Status\nURI: %s\n" + "Message: ",CurrentURI.c_str()); + + vsnprintf(S+Len,sizeof(S)-Len,Format,args); + strcat(S,"\n\n"); + + if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) + exit(100); +} + /*}}}*/ + // AcqMethod::FetchResult::FetchResult - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgAcqMethod::FetchResult::FetchResult() : LastModified(0), - IMSHit(false), Size(0) +pkgAcqMethod::FetchResult::FetchResult() : LastModified(0), + IMSHit(false), Size(0), ResumePoint(0) { } /*}}}*/