// -*- 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.21 1999/10/18 00:37:35 jgg 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
+ 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
+ downloading files..
+
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
#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 /*{{{*/
if ((Flags & LocalOnly) == LocalOnly)
strcat(End,"Local-Only: true\n");
+
+ if ((Flags & NeedsCleanup) == NeedsCleanup)
+ strcat(End,"Needs-Cleanup: 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(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)
{
FetchItem *Tmp = Queue;
Queue = Queue->Next;
delete Tmp;
+ if (Tmp == QueueBack)
+ QueueBack = Queue;
}
else
snprintf(S,sizeof(S),"400 URI Failure\nURI: <UNKNOWN>\n"
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);
+ End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);
if (Res.LastModified != 0)
End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
TimeRFC1123(Res.LastModified).c_str());
if (Res.ResumePoint != 0)
- End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",
+ End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",
Res.ResumePoint);
strcat(End,"\n");
End += snprintf(End,sizeof(S) - (End - S),"Filename: %s\n",Res.Filename.c_str());
if (Res.Size != 0)
- End += snprintf(End,sizeof(S) - (End - S),"Size: %u\n",Res.Size);
+ End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);
if (Res.LastModified != 0)
End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
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",
+ End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",
Res.ResumePoint);
if (Res.IMSHit == true)
End += snprintf(End,sizeof(S) - (End - S),"Alt-Filename: %s\n",Alt->Filename.c_str());
if (Alt->Size != 0)
- End += snprintf(End,sizeof(S) - (End - S),"Alt-Size: %u\n",Alt->Size);
+ End += snprintf(End,sizeof(S) - (End - S),"Alt-Size: %lu\n",Alt->Size);
if (Alt->LastModified != 0)
End += snprintf(End,sizeof(S) - (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-MD5Sum: %s\n",
+ End += snprintf(End,sizeof(S) - (End - S),"Alt-MD5-Hash: %s\n",
Alt->MD5Sum.c_str());
if (Alt->IMSHit == true)
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 */
-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",
while (1)
{
if (WaitFd(STDIN_FILENO) == false)
- exit(0);
+ return false;
if (ReadMessages(STDIN_FILENO,MyMessages) == false)
- exit(0);
-
+ return false;
+
string Message = MyMessages.front();
MyMessages.erase(MyMessages.begin());
// Change ack
if (Number == 603)
{
- while (Message.empty() == false)
+ while (MyMessages.empty() == false)
{
Messages.push_back(MyMessages.front());
MyMessages.erase(MyMessages.begin());
}
-
- return;
+
+ return !StringToBool(LookupTag(Message,"Fail"),false);
}
Messages.push_back(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;
}
/*}}}*/
// AcqMethod::Run - Run the message engine /*{{{*/
// ---------------------------------------------------------------------
-/* */
+/* Fetch any messages and execute them. In single mode it returns 1 if
+ there are no more available messages - any other result is a
+ fatal failure code! */
int pkgAcqMethod::Run(bool Single)
{
while (1)
{
if (Single == false)
if (WaitFd(STDIN_FILENO) == false)
- return 0;
-
+ break;
if (ReadMessages(STDIN_FILENO,Messages) == false)
- return 0;
+ break;
}
// Single mode exits if the message queue is empty
if (Single == true && Messages.empty() == true)
- return 0;
+ return -1;
string Message = Messages.front();
Messages.erase(Messages.begin());
}
switch (Number)
- {
+ {
case 601:
if (Configuration(Message) == false)
return 100;
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();
}
}
+ Exit();
return 0;
}
/*}}}*/
projects / apt.git / blobdiff