* remove all the remaining #pragma implementation

[apt.git] / apt-inst / contrib / extracttar.cc

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 95869fe4a3dac20024305e0551df7c756d943700..8a535967f282eedd2892340deede5f77ebab12a3 100644 (file)
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: extracttar.cc,v 1.4 2001/09/30 04:06:59 jgg Exp $
+// $Id: extracttar.cc,v 1.8.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    Extract a Tar - Tar Extractor
 /* ######################################################################
 
    Extract a Tar - Tar Extractor


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

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

 #include <apt-pkg/extracttar.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/extracttar.h>
 
 #include <apt-pkg/error.h>


@@ -30,8 +27,11 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>

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

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

+
+using namespace std;

     
 // The on disk header for a tar file.
 struct ExtractTar::TarHeader
     
 // The on disk header for a tar file.
 struct ExtractTar::TarHeader


@@ -55,8 +55,8 @@ struct ExtractTar::TarHeader
 // ExtractTar::ExtractTar - Constructor                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ExtractTar::ExtractTar - Constructor                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max) : File(Fd), 
-                         MaxInSize(Max)
+ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram) : File(Fd), 
+                         MaxInSize(Max), DecompressProg(DecompressionProgram)

 
 {
    GZPid = -1;
 
 {
    GZPid = -1;


@@ -90,7 +90,8 @@ bool ExtractTar::Done(bool Force)
    
    // Make sure we clean it up!
    kill(GZPid,SIGINT);
    
    // Make sure we clean it up!
    kill(GZPid,SIGINT);

-   if (ExecWait(GZPid,_config->Find("dir::bin::gzip","/bin/gzip").c_str(),
+   string confvar = string("dir::bin::") + DecompressProg;
+   if (ExecWait(GZPid,_config->Find(confvar.c_str(),DecompressProg.c_str()).c_str(),

                Force) == false)
    {
       GZPid = -1;
                Force) == false)
    {
       GZPid = -1;


@@ -110,7 +111,7 @@ bool ExtractTar::StartGzip()
 {
    int Pipes[2];
    if (pipe(Pipes) != 0)
 {
    int Pipes[2];
    if (pipe(Pipes) != 0)

-      return _error->Errno("pipe","Failed to create pipes");
+      return _error->Errno("pipe",_("Failed to create pipes"));

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


@@ -131,11 +132,13 @@ bool ExtractTar::StartGzip()
       SetCloseExec(STDERR_FILENO,false);
       
       const char *Args[3];
       SetCloseExec(STDERR_FILENO,false);
       
       const char *Args[3];

-      Args[0] = _config->Find("dir::bin::gzip","/bin/gzip").c_str();
+      string confvar = string("dir::bin::") + DecompressProg;
+      string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str());
+      Args[0] = argv0.c_str();

       Args[1] = "-d";
       Args[2] = 0;
       Args[1] = "-d";
       Args[2] = 0;

-      execv(Args[0],(char **)Args);
-      cerr << "Failed to exec gzip " << Args[0] << endl;
+      execvp(Args[0],(char **)Args);
+      cerr << _("Failed to exec gzip ") << Args[0] << endl;

       _exit(100);
    }
 
       _exit(100);
    }
 


@@ -172,7 +175,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       TarHeader *Tar = (TarHeader *)Block;
       unsigned long CheckSum;
       if (StrToNum(Tar->Checksum,CheckSum,sizeof(Tar->Checksum),8) == false)
       TarHeader *Tar = (TarHeader *)Block;
       unsigned long CheckSum;
       if (StrToNum(Tar->Checksum,CheckSum,sizeof(Tar->Checksum),8) == false)

-        return _error->Error("Corrupted archive");
+        return _error->Error(_("Corrupted archive"));

       
       /* Compute the checksum field. The actual checksum is blanked out
          with spaces so it is not included in the computation */
       
       /* Compute the checksum field. The actual checksum is blanked out
          with spaces so it is not included in the computation */


@@ -187,7 +190,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
         return Done(true);
       
       if (NewSum != CheckSum)
         return Done(true);
       
       if (NewSum != CheckSum)

-        return _error->Error("Tar Checksum failed, archive corrupted");
+        return _error->Error(_("Tar checksum failed, archive corrupted"));

    
       // Decode all of the fields
       pkgDirStream::Item Itm;
    
       // Decode all of the fields
       pkgDirStream::Item Itm;


@@ -198,7 +201,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
          StrToNum(Tar->MTime,Itm.MTime,sizeof(Tar->MTime),8) == false ||
          StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false ||
          StrToNum(Tar->Minor,Itm.Minor,sizeof(Tar->Minor),8) == false)
          StrToNum(Tar->MTime,Itm.MTime,sizeof(Tar->MTime),8) == false ||
          StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false ||
          StrToNum(Tar->Minor,Itm.Minor,sizeof(Tar->Minor),8) == false)

-        return _error->Error("Corrupted archive");
+        return _error->Error(_("Corrupted archive"));

       
       // Grab the filename
       if (LastLongName.empty() == false)
       
       // Grab the filename
       if (LastLongName.empty() == false)


@@ -290,7 +293,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
         
         default:
         BadRecord = true;
         
         default:
         BadRecord = true;

-        _error->Warning("Unkown TAR header type %u, member %s",(unsigned)Tar->LinkFlag,Tar->Name);
+        _error->Warning(_("Unknown TAR header type %u, member %s"),(unsigned)Tar->LinkFlag,Tar->Name);

         break;
       }
       
         break;
       }
       


@@ -304,7 +307,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       while (Size != 0)
       {
         unsigned char Junk[32*1024];
       while (Size != 0)
       {
         unsigned char Junk[32*1024];

-        unsigned long Read = MIN(Size,sizeof(Junk));
+        unsigned long Read = min(Size,(unsigned long)sizeof(Junk));

         if (InFd.Read(Junk,((Read+511)/512)*512) == false)
            return false;
         
         if (InFd.Read(Junk,((Read+511)/512)*512) == false)
            return false;