fileutl: simple_buffer: Add write() and full() methods

[apt.git] / methods / server.cc

diff --git a/methods/server.cc b/methods/server.cc
index f61a6fedb7221617154e189a6bdd06b299e55258..d5188d4a31450a81248b7269b87b4edc24602a58 100644 (file)
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -114,7 +114,7 @@ bool ServerState::HeaderLine(string Line)
 
    // Parse off any trailing spaces between the : and the next word.
    string::size_type Pos2 = Pos;
 
    // Parse off any trailing spaces between the : and the next word.
    string::size_type Pos2 = Pos;

-   while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0)
+   while (Pos2 < Line.length() && isspace_ascii(Line[Pos2]) != 0)

       Pos2++;
 
    string Tag = string(Line,0,Pos);
       Pos2++;
 
    string Tag = string(Line,0,Pos);


@@ -252,17 +252,6 @@ bool ServerState::AddPartialFileToHashes(FileFd &File)                     /*{{{*/
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-bool ServerMethod::Configuration(string Message)                       /*{{{*/
-{
-   if (pkgAcqMethod::Configuration(Message) == false)
-      return false;
-
-   DropPrivsOrDie();
-
-   return true;
-}
-                                                                       /*}}}*/
-

 // ServerMethod::DealWithHeaders - Handle the retrieved header data    /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what
 // ServerMethod::DealWithHeaders - Handle the retrieved header data    /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what


@@ -274,7 +263,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
    // Not Modified
    if (Server->Result == 304)
    {
    // Not Modified
    if (Server->Result == 304)
    {

-      unlink(Queue->DestFile.c_str());
+      RemoveFile("server", Queue->DestFile);

       Res.IMSHit = true;
       Res.LastModified = Queue->LastModified;
       return IMS_HIT;
       Res.IMSHit = true;
       Res.LastModified = Queue->LastModified;
       return IMS_HIT;


@@ -350,7 +339,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
            Server->StartPos = Server->TotalFileSize;
            Server->Result = 200;
         }
            Server->StartPos = Server->TotalFileSize;
            Server->Result = 200;
         }

-        else if (unlink(Queue->DestFile.c_str()) == 0)
+        else if (RemoveFile("server", Queue->DestFile))

         {
            NextURI = Queue->Uri;
            return TRY_AGAIN_OR_REDIRECT;
         {
            NextURI = Queue->Uri;
            return TRY_AGAIN_OR_REDIRECT;


@@ -358,7 +347,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
       }
    }
 
       }
    }
 

-   /* We have a reply we dont handle. This should indicate a perm server
+   /* We have a reply we don't handle. This should indicate a perm server

       failure */
    if (Server->Result < 200 || Server->Result >= 300)
    {
       failure */
    if (Server->Result < 200 || Server->Result >= 300)
    {


@@ -382,7 +371,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
       return ERROR_NOT_FROM_SERVER;
 
    FailFile = Queue->DestFile;
       return ERROR_NOT_FROM_SERVER;
 
    FailFile = Queue->DestFile;

-   FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
+   FailFile.c_str();   // Make sure we don't do a malloc in the signal handler

    FailFd = File->Fd();
    FailTime = Server->Date;
 
    FailFd = File->Fd();
    FailTime = Server->Date;
 


@@ -495,10 +484,8 @@ int ServerMethod::Loop()
       
       // Connect to the server
       if (Server == 0 || Server->Comp(Queue->Uri) == false)
       
       // Connect to the server
       if (Server == 0 || Server->Comp(Queue->Uri) == false)

-      {
-        delete Server;

         Server = CreateServerState(Queue->Uri);
         Server = CreateServerState(Queue->Uri);

-      }
+

       /* If the server has explicitly said this is the last connection
          then we pre-emptively shut down the pipeline and tear down 
         the connection. This will speed up HTTP/1.0 servers a tad
       /* If the server has explicitly said this is the last connection
          then we pre-emptively shut down the pipeline and tear down 
         the connection. This will speed up HTTP/1.0 servers a tad


@@ -515,8 +502,7 @@ int ServerMethod::Loop()
       if (Server->Open() == false)
       {
         Fail(true);
       if (Server->Open() == false)
       {
         Fail(true);

-        delete Server;
-        Server = 0;
+        Server = nullptr;

         continue;
       }
 
         continue;
       }
 


@@ -748,9 +734,7 @@ int ServerMethod::Loop()
    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

-                                                                       /*{{{*/
-unsigned long long
-ServerMethod::FindMaximumObjectSizeInQueue() const 
+unsigned long long ServerMethod::FindMaximumObjectSizeInQueue() const  /*{{{*/

 {
    unsigned long long MaxSizeInQueue = 0;
    for (FetchItem *I = Queue; I != 0 && I != QueueBack; I = I->Next)
 {
    unsigned long long MaxSizeInQueue = 0;
    for (FetchItem *I = Queue; I != 0 && I != QueueBack; I = I->Next)


@@ -758,3 +742,9 @@ ServerMethod::FindMaximumObjectSizeInQueue() const
    return MaxSizeInQueue;
 }
                                                                        /*}}}*/
    return MaxSizeInQueue;
 }
                                                                        /*}}}*/

+ServerMethod::ServerMethod(char const * const Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/
+   aptMethod(Binary, Ver, Flags), Server(nullptr), File(NULL), PipelineDepth(10),
+   AllowRedirect(false), Debug(false)
+{
+}
+                                                                       /*}}}*/