Back out fix for now; not sure I want to bump the lib v...

[apt.git] / apt-pkg / acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 972ab2455027de38afa06f40dad1f11fcaa3ac02..5cd7d6f1e640458aef11edffb85357605bbdec97 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-worker.cc,v 1.27 1999/08/28 01:49:56 jgg Exp $
+// $Id: acquire-worker.cc,v 1.34 2001/05/22 04:42:54 jgg Exp $

 /* ######################################################################
 
    Acquire Worker 
 /* ######################################################################
 
    Acquire Worker 


@@ -22,6 +22,11 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 

+#include <apti18n.h>
+
+#include <iostream>
+#include <fstream>
+    

 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>


@@ -30,6 +35,8 @@
 #include <errno.h>
                                                                        /*}}}*/
 
 #include <errno.h>
                                                                        /*}}}*/
 

+using namespace std;
+

 // Worker::Worker - Constructor for Queue startup                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Worker::Worker - Constructor for Queue startup                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -86,7 +93,10 @@ pkgAcquire::Worker::~Worker()
    
    if (Process > 0)
    {
    
    if (Process > 0)
    {

-      kill(Process,SIGINT);
+      /* Closing of stdin is the signal to exit and die when the process
+         indicates it needs cleanup */
+      if (Config->NeedsCleanup == false)
+        kill(Process,SIGINT);

       ExecWait(Process,Access.c_str(),true);
    }   
 }
       ExecWait(Process,Access.c_str(),true);
    }   
 }


@@ -99,7 +109,7 @@ bool pkgAcquire::Worker::Start()
    // Get the method path
    string Method = _config->FindDir("Dir::Bin::Methods") + Access;
    if (FileExists(Method) == false)
    // Get the method path
    string Method = _config->FindDir("Dir::Bin::Methods") + Access;
    if (FileExists(Method) == false)

-      return _error->Error("The method driver %s could not be found.",Method.c_str());
+      return _error->Error(_("The method driver %s could not be found."),Method.c_str());

 
    if (Debug == true)
       clog << "Starting method '" << Method << '\'' << endl;
 
    if (Debug == true)
       clog << "Starting method '" << Method << '\'' << endl;


@@ -114,18 +124,15 @@ bool pkgAcquire::Worker::Start()
       return false;
    }
    for (int I = 0; I != 4; I++)
       return false;
    }
    for (int I = 0; I != 4; I++)

-      SetCloseExec(Pipes[0],true);
+      SetCloseExec(Pipes[I],true);

    
    // Fork off the process
    Process = ExecFork();
    
    // Fork off the process
    Process = ExecFork();

-
-   // Spawn the subprocess

    if (Process == 0)
    {
       // Setup the FDs
       dup2(Pipes[1],STDOUT_FILENO);
       dup2(Pipes[2],STDIN_FILENO);
    if (Process == 0)
    {
       // Setup the FDs
       dup2(Pipes[1],STDOUT_FILENO);
       dup2(Pipes[2],STDIN_FILENO);

-      dup2(((filebuf *)clog.rdbuf())->fd(),STDERR_FILENO);

       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);      
       SetCloseExec(STDERR_FILENO,false);
       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);      
       SetCloseExec(STDERR_FILENO,false);


@@ -151,7 +158,7 @@ bool pkgAcquire::Worker::Start()
    // Read the configuration data
    if (WaitFd(InFd) == false ||
        ReadMessages() == false)
    // Read the configuration data
    if (WaitFd(InFd) == false ||
        ReadMessages() == false)

-      return _error->Error("Method %s did not start correctly",Method.c_str());
+      return _error->Error(_("Method %s did not start correctly"),Method.c_str());

 
    RunMessages();
    if (OwnerQ != 0)
 
    RunMessages();
    if (OwnerQ != 0)


@@ -230,6 +237,10 @@ bool pkgAcquire::Worker::RunMessages()
            ResumePoint = atoi(LookupTag(Message,"Resume-Point","0").c_str());
            Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str()));
 
            ResumePoint = atoi(LookupTag(Message,"Resume-Point","0").c_str());
            Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str()));
 

+           // Display update before completion
+           if (Log != 0 && Log->MorePulses == true)
+              Log->Pulse(Itm->Owner->GetOwner());
+           

            if (Log != 0)
               Log->Fetch(*Itm);
 
            if (Log != 0)
               Log->Fetch(*Itm);
 


@@ -244,17 +255,22 @@ bool pkgAcquire::Worker::RunMessages()
               _error->Error("Method gave invalid 201 URI Done message");
               break;
            }
               _error->Error("Method gave invalid 201 URI Done message");
               break;
            }

-
+           

            pkgAcquire::Item *Owner = Itm->Owner;
            pkgAcquire::ItemDesc Desc = *Itm;
            pkgAcquire::Item *Owner = Itm->Owner;
            pkgAcquire::ItemDesc Desc = *Itm;

+           
+           // Display update before completion
+           if (Log != 0 && Log->MorePulses == true)
+              Log->Pulse(Owner->GetOwner());
+           

            OwnerQ->ItemDone(Itm);
            OwnerQ->ItemDone(Itm);

-           if (TotalSize != 0 && 
+           if (TotalSize != 0 &&

                (unsigned)atoi(LookupTag(Message,"Size","0").c_str()) != TotalSize)
                (unsigned)atoi(LookupTag(Message,"Size","0").c_str()) != TotalSize)

-              _error->Warning("Bizzar Error - File size is not what the server reported %s %u",
+              _error->Warning("Bizarre Error - File size is not what the server reported %s %lu",

                               LookupTag(Message,"Size","0").c_str(),TotalSize);
 
            Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
                               LookupTag(Message,"Size","0").c_str(),TotalSize);
 
            Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),

-                       LookupTag(Message,"MD5-Hash"));
+                       LookupTag(Message,"MD5-Hash"),Config);

            ItemDone();
            
            // Log that we are done
            ItemDone();
            
            // Log that we are done


@@ -283,6 +299,10 @@ bool pkgAcquire::Worker::RunMessages()
               break;
            }
 
               break;
            }
 

+           // Display update before completion
+           if (Log != 0 && Log->MorePulses == true)
+              Log->Pulse(Itm->Owner->GetOwner());
+           

            pkgAcquire::Item *Owner = Itm->Owner;
            pkgAcquire::ItemDesc Desc = *Itm;
            OwnerQ->ItemDone(Itm);
            pkgAcquire::Item *Owner = Itm->Owner;
            pkgAcquire::ItemDesc Desc = *Itm;
            OwnerQ->ItemDone(Itm);


@@ -297,7 +317,7 @@ bool pkgAcquire::Worker::RunMessages()
         
         // 401 General Failure
         case 401:
         
         // 401 General Failure
         case 401:

-        _error->Error("Method %s General failure: %s",LookupTag(Message,"Message").c_str());
+        _error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str());

         break;
         
         // 403 Media Change
         break;
         
         // 403 Media Change


@@ -323,15 +343,20 @@ bool pkgAcquire::Worker::Capabilities(string Message)
    Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);
    Config->SendConfig = StringToBool(LookupTag(Message,"Send-Config"),false);
    Config->LocalOnly = StringToBool(LookupTag(Message,"Local-Only"),false);
    Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);
    Config->SendConfig = StringToBool(LookupTag(Message,"Send-Config"),false);
    Config->LocalOnly = StringToBool(LookupTag(Message,"Local-Only"),false);

+   Config->NeedsCleanup = StringToBool(LookupTag(Message,"Needs-Cleanup"),false);
+   Config->Removable = StringToBool(LookupTag(Message,"Removable"),false);

 
    // Some debug text
    if (Debug == true)
    {
       clog << "Configured access method " << Config->Access << endl;
 
    // Some debug text
    if (Debug == true)
    {
       clog << "Configured access method " << Config->Access << endl;

-      clog << "Version:" << Config->Version << " SingleInstance:" <<
-        Config->SingleInstance << 
-        " Pipeline:" << Config->Pipeline << " SendConfig:" << 
-        Config->SendConfig << endl;
+      clog << "Version:" << Config->Version <<
+             " SingleInstance:" << Config->SingleInstance <<
+             " Pipeline:" << Config->Pipeline << 
+             " SendConfig:" << Config->SendConfig << 
+             " LocalOnly: " << Config->LocalOnly << 
+             " NeedsCleanup: " << Config->NeedsCleanup << 
+             " Removable: " << Config->Removable << endl;

    }
    
    return true;
    }
    
    return true;


@@ -346,7 +371,7 @@ bool pkgAcquire::Worker::MediaChange(string Message)
                                    LookupTag(Message,"Drive")) == false)
    {
       char S[300];
                                    LookupTag(Message,"Drive")) == false)
    {
       char S[300];

-      sprintf(S,"603 Media Changed\nFailed: true\n\n");
+      snprintf(S,sizeof(S),"603 Media Changed\nFailed: true\n\n");

       if (Debug == true)
         clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl;
       OutQueue += S;
       if (Debug == true)
         clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl;
       OutQueue += S;


@@ -355,7 +380,7 @@ bool pkgAcquire::Worker::MediaChange(string Message)
    }
 
    char S[300];
    }
 
    char S[300];

-   sprintf(S,"603 Media Changed\n\n");
+   snprintf(S,sizeof(S),"603 Media Changed\n\n");

    if (Debug == true)
       clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl;
    OutQueue += S;
    if (Debug == true)
       clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl;
    OutQueue += S;


@@ -384,7 +409,7 @@ bool pkgAcquire::Worker::SendConfiguration()
    {
       if (Top->Value.empty() == false)
       {
    {
       if (Top->Value.empty() == false)
       {

-        string Line = "Config-Item: " + Top->FullTag() + "=";
+        string Line = "Config-Item: " + QuoteString(Top->FullTag(),"=\"\n") + "=";

         Line += QuoteString(Top->Value,"\n") + '\n';
         Message += Line;
       }
         Line += QuoteString(Top->Value,"\n") + '\n';
         Message += Line;
       }


@@ -441,7 +466,7 @@ bool pkgAcquire::Worker::OutFdReady()
    int Res;
    do
    {
    int Res;
    do
    {

-      Res = write(OutFd,OutQueue.begin(),OutQueue.length());
+      Res = write(OutFd,OutQueue.c_str(),OutQueue.length());

    }
    while (Res < 0 && errno == EINTR);
    
    }
    while (Res < 0 && errno == EINTR);