remove the ABI compatible stub for GetListOfFilesInDir

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

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 63bb2ba804ba53827512e0a0920798bd8db531e4..3d2788aafbdf18070e8c3747b962213471be1188 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.9 2004/01/07 20:39:37 mdz 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,15 +16,12 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/extracttar.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>

-#include <system.h>
+#include <apt-pkg/macros.h>

 
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <unistd.h>


@@ -58,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;


@@ -93,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;


@@ -134,10 +132,12 @@ 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);
+      execvp(Args[0],(char **)Args);

       cerr << _("Failed to exec gzip ") << Args[0] << endl;
       _exit(100);
    }
       cerr << _("Failed to exec gzip ") << Args[0] << endl;
       _exit(100);
    }


@@ -190,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;


@@ -208,14 +208,14 @@ bool ExtractTar::Go(pkgDirStream &Stream)
         Itm.Name = (char *)LastLongName.c_str();
       else
       {
         Itm.Name = (char *)LastLongName.c_str();
       else
       {

-        Tar->Name[sizeof(Tar->Name)] = 0;
+        Tar->Name[sizeof(Tar->Name)-1] = 0;

         Itm.Name = Tar->Name;
       }      
       if (Itm.Name[0] == '.' && Itm.Name[1] == '/' && Itm.Name[2] != 0)
         Itm.Name += 2;
       
       // Grab the link target
         Itm.Name = Tar->Name;
       }      
       if (Itm.Name[0] == '.' && Itm.Name[1] == '/' && Itm.Name[2] != 0)
         Itm.Name += 2;
       
       // Grab the link target

-      Tar->Name[sizeof(Tar->LinkName)] = 0;
+      Tar->Name[sizeof(Tar->LinkName)-1] = 0;

       Itm.LinkTarget = Tar->LinkName;
 
       if (LastLongLink.empty() == false)
       Itm.LinkTarget = Tar->LinkName;
 
       if (LastLongLink.empty() == false)


@@ -307,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;
         


@@ -332,7 +332,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       }
       
       // And finish up
       }
       
       // And finish up

-      if (Itm.Size != 0 && BadRecord == false)
+      if (Itm.Size >= 0 && BadRecord == false)

         if (Stream.FinishedFile(Itm,Fd) == false)
            return false;
       
         if (Stream.FinishedFile(Itm,Fd) == false)
            return false;