merged from debian-sid

[apt.git] / apt-inst / deb / debfile.cc

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 5c8339637dca233d62199ef432d95feb2fd8a5c0..4bd065cf8aa0dbb6f7a939b3034851529ef63c0a 100644 (file)
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debfile.cc,v 1.3 2003/02/10 00:36:12 doogie Exp $
+// $Id: debfile.cc,v 1.3.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    Debian Archive File (.deb)
 /* ######################################################################
 
    Debian Archive File (.deb)


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

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debfile.h"
-#endif
+#include<config.h>

 
 

-#include <apti18n.h>
+#include <apt-pkg/database.h>

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

+#include <apt-pkg/aptconfiguration.h>

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

+#include <apti18n.h>

                                                                        /*}}}*/
 
 // DebFile::debDebFile - Constructor                                   /*{{{*/
                                                                        /*}}}*/
 
 // DebFile::debDebFile - Constructor                                   /*{{{*/


@@ -37,12 +37,25 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File)
 {
    if (_error->PendingError() == true)
       return;
 {
    if (_error->PendingError() == true)
       return;

-   
-   // Check the members for validity
-   if (CheckMember("debian-binary") == false ||
-       CheckMember("control.tar.gz") == false ||
-       CheckMember("data.tar.gz") == false)
+
+   if (!CheckMember("debian-binary")) {
+      _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "debian-binary");
+      return;
+   }
+
+   if (!CheckMember("control.tar.gz")) {
+      _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "control.tar.gz");
+      return;
+   }
+
+   if (!CheckMember("data.tar.gz") &&
+       !CheckMember("data.tar.bz2") &&
+       !CheckMember("data.tar.lzma") &&
+       !CheckMember("data.tar.xz")) {
+      // FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+      _error->Error(_("This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2", "data.tar.lzma");

       return;
       return;

+   }

 }
                                                                        /*}}}*/
 // DebFile::CheckMember - Check if a named member is in the archive    /*{{{*/
 }
                                                                        /*}}}*/
 // DebFile::CheckMember - Check if a named member is in the archive    /*{{{*/


@@ -52,7 +65,7 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File)
 bool debDebFile::CheckMember(const char *Name)
 {
    if (AR.FindMember(Name) == 0)
 bool debDebFile::CheckMember(const char *Name)
 {
    if (AR.FindMember(Name) == 0)

-      return _error->Error(_("This is not a valid DEB archive, missing '%s' member"),Name);
+      return false;

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -69,7 +82,6 @@ const ARArchive::Member *debDebFile::GotoMember(const char *Name)
    const ARArchive::Member *Member = AR.FindMember(Name);
    if (Member == 0)
    {
    const ARArchive::Member *Member = AR.FindMember(Name);
    if (Member == 0)
    {

-      _error->Error(_("Internal Error, could not locate member %s"),Name);

       return 0;
    }
    if (File.Seek(Member->Start) == false)
       return 0;
    }
    if (File.Seek(Member->Start) == false)


@@ -91,13 +103,13 @@ bool debDebFile::ExtractControl(pkgDataBase &DB)
       
    // Prepare Tar
    ControlExtract Extract;
       
    // Prepare Tar
    ControlExtract Extract;

-   ExtractTar Tar(File,Member->Size);
+   ExtractTar Tar(File,Member->Size,"gzip");

    if (_error->PendingError() == true)
       return false;
    
    // Get into the temporary directory
    if (_error->PendingError() == true)
       return false;
    
    // Get into the temporary directory

-   string Cwd = SafeGetCWD();
-   string Tmp;
+   std::string Cwd = SafeGetCWD();
+   std::string Tmp;

    if (DB.GetMetaTmp(Tmp) == false)
       return false;
    if (chdir(Tmp.c_str()) != 0)
    if (DB.GetMetaTmp(Tmp) == false)
       return false;
    if (chdir(Tmp.c_str()) != 0)


@@ -119,15 +131,37 @@ bool debDebFile::ExtractControl(pkgDataBase &DB)
 /* Simple wrapper around tar.. */
 bool debDebFile::ExtractArchive(pkgDirStream &Stream)
 {
 /* Simple wrapper around tar.. */
 bool debDebFile::ExtractArchive(pkgDirStream &Stream)
 {

-   // Get the archive member and positition the file 
-   const ARArchive::Member *Member = AR.FindMember("data.tar.gz");
-   if (Member == 0)
-      return _error->Error(_("Internal Error, could not locate member"));   
+   // Get the archive member
+   const ARArchive::Member *Member = NULL;
+   std::string Compressor;
+
+   std::string const data = "data.tar";
+   std::vector<APT::Configuration::Compressor> compressor = APT::Configuration::getCompressors();
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+       c != compressor.end(); ++c)
+   {
+      Member = AR.FindMember(std::string(data).append(c->Extension).c_str());
+      if (Member == NULL)
+        continue;
+      Compressor = c->Binary;
+      break;
+   }
+
+   if (Member == NULL)
+   {
+      std::string ext = "data.tar.{";
+      for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+          c != compressor.end(); ++c)
+        ext.append(c->Extension.substr(1));
+      ext.append("}");
+      return _error->Error(_("Internal error, could not locate member %s"), ext.c_str());
+   }
+

    if (File.Seek(Member->Start) == false)
       return false;
    if (File.Seek(Member->Start) == false)
       return false;

-      
+

    // Prepare Tar
    // Prepare Tar

-   ExtractTar Tar(File,Member->Size);
+   ExtractTar Tar(File,Member->Size,Compressor);

    if (_error->PendingError() == true)
       return false;
    return Tar.Go(Stream);
    if (_error->PendingError() == true)
       return false;
    return Tar.Go(Stream);


@@ -141,7 +175,7 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
 pkgCache::VerIterator debDebFile::MergeControl(pkgDataBase &DB)
 {
    // Open the control file
 pkgCache::VerIterator debDebFile::MergeControl(pkgDataBase &DB)
 {
    // Open the control file

-   string Tmp;
+   std::string Tmp;

    if (DB.GetMetaTmp(Tmp) == false)
       return pkgCache::VerIterator(DB.GetCache());
    FileFd Fd(Tmp + "control",FileFd::ReadOnly);
    if (DB.GetMetaTmp(Tmp) == false)
       return pkgCache::VerIterator(DB.GetCache());
    FileFd Fd(Tmp + "control",FileFd::ReadOnly);


@@ -230,7 +264,7 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
       return false;
 
    // Extract it.
       return false;
 
    // Extract it.

-   ExtractTar Tar(Deb.GetFile(),Member->Size);
+   ExtractTar Tar(Deb.GetFile(),Member->Size,"gzip");

    if (Tar.Go(*this) == false)
       return false;
 
    if (Tar.Go(*this) == false)
       return false;
 


@@ -240,7 +274,7 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
    Control[Length] = '\n';
    Control[Length+1] = '\n';
    if (Section.Scan(Control,Length+2) == false)
    Control[Length] = '\n';
    Control[Length+1] = '\n';
    if (Section.Scan(Control,Length+2) == false)

-      return _error->Error(_("Unparsible control file"));
+      return _error->Error(_("Unparsable control file"));

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/