X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/05eb7df02d6a641678975899b1936500f5bc703b..73fc19d055b20178e5efae08013fe24663f6d89c:/apt-inst/contrib/extracttar.cc

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index fcfc89927..8338fd89d 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: extracttar.cc,v 1.7 2003/02/10 00:36:12 doogie Exp $
+// $Id: extracttar.cc,v 1.8.2.1 2004/01/16 18:58:50 mdz Exp $
 /* ######################################################################
 
    Extract a Tar - Tar Extractor
@@ -16,10 +16,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/extracttar.h"
-#endif
-#include <apti18n.h>
 #include <apt-pkg/extracttar.h>
 
 #include <apt-pkg/error.h>
@@ -32,7 +28,9 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
+
 using namespace std;
     
 // The on disk header for a tar file.
@@ -57,8 +55,8 @@ struct ExtractTar::TarHeader
 // 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;
@@ -92,7 +90,8 @@ bool ExtractTar::Done(bool Force)
    
    // 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;
@@ -133,10 +132,12 @@ bool ExtractTar::StartGzip()
       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;
-      execv(Args[0],(char **)Args);
+      execvp(Args[0],(char **)Args);
       cerr << _("Failed to exec gzip ") << Args[0] << endl;
       _exit(100);
    }
@@ -189,7 +190,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
 	 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;
@@ -207,14 +208,14 @@ bool ExtractTar::Go(pkgDirStream &Stream)
 	 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
-      Tar->Name[sizeof(Tar->LinkName)] = 0;
+      Tar->Name[sizeof(Tar->LinkName)-1] = 0;
       Itm.LinkTarget = Tar->LinkName;
 
       if (LastLongLink.empty() == false)
@@ -292,7 +293,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
 	 
 	 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;
       }
       
@@ -306,7 +307,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       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;
 	 
@@ -331,7 +332,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       }
       
       // And finish up
-      if (Itm.Size != 0 && BadRecord == false)
+      if (Itm.Size >= 0 && BadRecord == false)
 	 if (Stream.FinishedFile(Itm,Fd) == false)
 	    return false;