* apt--mvo merged

[apt.git] / ftparchive / contents.cc

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 145a68781bee38b4e46961ccd574331f2ec62f3a..3801995bd3829a40929f34097ae389296c75bd33 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: contents.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: contents.cc,v 1.4 2003/02/10 07:34:41 doogie Exp $

 /* ######################################################################
    
    contents - Archive contents generator
 /* ######################################################################
    
    contents - Archive contents generator


@@ -35,6 +35,7 @@
 // Include Files                                                       /*{{{*/
 #include "contents.h"
 
 // Include Files                                                       /*{{{*/
 #include "contents.h"
 

+#include <apti18n.h>

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


@@ -257,6 +258,7 @@ void GenContents::WriteSpace(FILE *Out,unsigned int Current,unsigned int Target)
 void GenContents::Print(FILE *Out)
 {
    char Buffer[1024];
 void GenContents::Print(FILE *Out)
 {
    char Buffer[1024];

+   Buffer[0] = 0;

    DoPrint(Out,&Root,Buffer);
 }
 void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)
    DoPrint(Out,&Root,Buffer);
 }
 void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)


@@ -306,11 +308,18 @@ bool ContentsExtract::Read(debDebFile &Deb)
    
    // Get the archive member and positition the file 
    const ARArchive::Member *Member = Deb.GotoMember("data.tar.gz");
    
    // Get the archive member and positition the file 
    const ARArchive::Member *Member = Deb.GotoMember("data.tar.gz");

-   if (Member == 0)
+   const char *Compressor = "gzip";
+   if (Member == 0) {
+      Member = Deb.GotoMember("data.tar.bz2");
+      Compressor = "bzip2";
+   }
+   if (Member == 0) {
+      _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz");

       return false;
       return false;

+   }

       
    // Extract it.
       
    // Extract it.

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

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


@@ -341,7 +350,7 @@ bool ContentsExtract::DoItem(Item &Itm,int &Fd)
         MaxSize = 512*1024/2;
       char *NewData = (char *)realloc(Data,MaxSize*2);
       if (NewData == 0)
         MaxSize = 512*1024/2;
       char *NewData = (char *)realloc(Data,MaxSize*2);
       if (NewData == 0)

-        return _error->Error("realloc - Failed to allocate memory");
+        return _error->Error(_("realloc - Failed to allocate memory"));

       Data = NewData;
       MaxSize *= 2;
    }
       Data = NewData;
       MaxSize *= 2;
    }


@@ -372,7 +381,7 @@ bool ContentsExtract::TakeContents(const void *NewData,unsigned long Length)
       
       char *NewData = (char *)realloc(Data,MaxSize*2);
       if (NewData == 0)
       
       char *NewData = (char *)realloc(Data,MaxSize*2);
       if (NewData == 0)

-        return _error->Error("realloc - Failed to allocate memory");
+        return _error->Error(_("realloc - Failed to allocate memory"));

       Data = NewData;
       MaxSize *= 2;
    }
       Data = NewData;
       MaxSize *= 2;
    }