* merged from main

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

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 29d5cd9d59cfff960268afbdc23a5f7a2990b355..25d40ef542f82a7f8af80c75e6284b6b2c1cf7ff 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.22 1999/05/23 06:47:43 jgg Exp $
+// $Id: acquire-worker.cc,v 1.34 2001/05/22 04:42:54 jgg Exp $

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


@@ -12,9 +12,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/acquire-worker.h"
-#endif

 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>


@@ -22,15 +19,22 @@
 #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 <sstream>
+#include <fstream>
+    

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

-#include <wait.h>

 #include <stdio.h>
 #include <errno.h>
                                                                        /*}}}*/
 
 #include <stdio.h>
 #include <errno.h>
                                                                        /*}}}*/
 

+using namespace std;
+

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


@@ -41,7 +45,9 @@ pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
    Config = Cnf;
    Access = Cnf->Access;
    CurrentItem = 0;
    Config = Cnf;
    Access = Cnf->Access;
    CurrentItem = 0;

-
+   TotalSize = 0;
+   CurrentSize = 0;
+   

    Construct();   
 }
                                                                        /*}}}*/
    Construct();   
 }
                                                                        /*}}}*/


@@ -54,6 +60,8 @@ pkgAcquire::Worker::Worker(MethodConfig *Cnf)
    Config = Cnf;
    Access = Cnf->Access;
    CurrentItem = 0;
    Config = Cnf;
    Access = Cnf->Access;
    CurrentItem = 0;

+   TotalSize = 0;
+   CurrentSize = 0;

    
    Construct();   
 }
    
    Construct();   
 }


@@ -83,9 +91,11 @@ pkgAcquire::Worker::~Worker()
    
    if (Process > 0)
    {
    
    if (Process > 0)
    {

-      kill(Process,SIGINT);
-      if (waitpid(Process,0,0) != Process)
-        _error->Warning("I waited but nothing was there!");
+      /* 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);

    }   
 }
                                                                        /*}}}*/
    }   
 }
                                                                        /*}}}*/


@@ -97,7 +107,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;


@@ -112,18 +122,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);


@@ -149,7 +156,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)


@@ -228,6 +235,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);
 


@@ -242,12 +253,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 &&
+               (unsigned)atoi(LookupTag(Message,"Size","0").c_str()) != TotalSize)
+              _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()),
            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


@@ -263,7 +284,7 @@ bool pkgAcquire::Worker::RunMessages()
               }               
               else
                  Log->Done(Desc);
               }               
               else
                  Log->Done(Desc);

-           }       
+           }

            break;
         }       
         
            break;
         }       
         


@@ -276,9 +297,20 @@ 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);

+
+           // set some status
+           if(LookupTag(Message,"FailReason") == "Timeout" || 
+              LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+              LookupTag(Message,"FailReason") == "ConnectionRefused") 
+              Owner->Status = pkgAcquire::Item::StatTransientNetworkError;
+

            Owner->Failed(Message,Config);
            ItemDone();
 
            Owner->Failed(Message,Config);
            ItemDone();
 


@@ -290,7 +322,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


@@ -316,15 +348,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;


@@ -335,11 +372,29 @@ bool pkgAcquire::Worker::Capabilities(string Message)
 /* */
 bool pkgAcquire::Worker::MediaChange(string Message)
 {
 /* */
 bool pkgAcquire::Worker::MediaChange(string Message)
 {

+   int status_fd = _config->FindI("APT::Status-Fd",-1);
+   if(status_fd > 0) 
+   {
+      string Media = LookupTag(Message,"Media");
+      string Drive = LookupTag(Message,"Drive"); 
+      ostringstream msg,status;
+      ioprintf(msg,_("Please insert the disc labeled: "
+                    "'%s' "
+                    "in the drive '%s' and press enter."),
+              Media.c_str(),Drive.c_str());
+      status << "media-change: "  // message
+            << Media  << ":"     // media
+            << Drive  << ":"     // drive
+            << msg.str()         // l10n message
+            << endl;
+      write(status_fd, status.str().c_str(), status.str().size());
+   }
+

    if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),
                                    LookupTag(Message,"Drive")) == false)
    {
       char S[300];
    if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),
                                    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;


@@ -348,7 +403,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;


@@ -377,7 +432,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;
       }


@@ -434,7 +489,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);
    


@@ -471,8 +526,7 @@ bool pkgAcquire::Worker::MethodFailure()
 {
    _error->Error("Method %s has died unexpectedly!",Access.c_str());
    
 {
    _error->Error("Method %s has died unexpectedly!",Access.c_str());
    

-   if (waitpid(Process,0,0) != Process)
-      _error->Warning("I waited but nothing was there!");
+   ExecWait(Process,Access.c_str(),true);

    Process = -1;
    close(InFd);
    close(OutFd);
    Process = -1;
    close(InFd);
    close(OutFd);


@@ -498,6 +552,10 @@ void pkgAcquire::Worker::Pulse()
    if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0)
       return;
    CurrentSize = Buf.st_size;
    if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0)
       return;
    CurrentSize = Buf.st_size;

+   
+   // Hmm? Should not happen...
+   if (CurrentSize > TotalSize && TotalSize != 0)
+      TotalSize = CurrentSize;

 }
                                                                        /*}}}*/
 // Worker::ItemDone - Called when the current item is finished         /*{{{*/
 }
                                                                        /*}}}*/
 // Worker::ItemDone - Called when the current item is finished         /*{{{*/