* apt-pkg/acquire-worker.cc:

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

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 5c8339637dca233d62199ef432d95feb2fd8a5c0..9d83120f895c9f975e864f10018e12b80b7ca11e 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,11 +16,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

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

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


@@ -28,6 +23,7 @@
 
 #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 +33,21 @@ 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")) {
+      _error->Error(_("This is not a valid DEB archive, it has no '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2");

       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 +57,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 +74,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,7 +95,7 @@ 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;
    
    if (_error->PendingError() == true)
       return false;
    


@@ -121,13 +125,18 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
 {
    // Get the archive member and positition the file 
    const ARArchive::Member *Member = AR.FindMember("data.tar.gz");
 {
    // Get the archive member and positition the file 
    const ARArchive::Member *Member = AR.FindMember("data.tar.gz");

+   const char *Compressor = "gzip";
+   if (Member == 0) {
+      Member = AR.FindMember("data.tar.bz2");
+      Compressor = "bzip2";
+   }

    if (Member == 0)
    if (Member == 0)

-      return _error->Error(_("Internal Error, could not locate member"));   
+      return _error->Error(_("Internal error, could not locate member"));   

    if (File.Seek(Member->Start) == false)
       return false;
       
    // Prepare Tar
    if (File.Seek(Member->Start) == false)
       return false;
       
    // 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);


@@ -230,7 +239,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 +249,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;
 }
                                                                        /*}}}*/