merged r1970 lp:~vorlon/apt/lp.968828

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

diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 7c85f2e866282cf52ae9fcb0a9472348bf3825f8..2dee1a40d88ac149b1409733a97dba55a8f03a6a 100644 (file)
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -14,13 +14,17 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
+#include<config.h>
+
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdlib.h>
-                                                                       /*}}}*/
+
 #include <apti18n.h>
+                                                                       /*}}}*/
 
 struct ARArchive::MemberHeader
 {
@@ -87,7 +91,7 @@ bool ARArchive::LoadHeaders()
          StrToNum(Head.Size,Memb->Size,sizeof(Head.Size)) == false)
       {
         delete Memb;
-        return _error->Error(_("Invalid archive member header"));
+        return _error->Error(_("Invalid archive member header %s"), Head.Name);
       }
         
       // Check for an extra long name string
@@ -96,7 +100,7 @@ bool ARArchive::LoadHeaders()
         char S[300];
         unsigned long Len;
         if (StrToNum(Head.Name+3,Len,sizeof(Head.Size)-3) == false ||
-            Len >= strlen(S))
+            Len >= sizeof(S))
         {
            delete Memb;
            return _error->Error(_("Invalid archive member header"));
@@ -112,7 +116,7 @@ bool ARArchive::LoadHeaders()
       {
         unsigned int I = sizeof(Head.Name) - 1;
         for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
-        Memb->Name = string(Head.Name,I+1);
+        Memb->Name = std::string(Head.Name,I+1);
       }
 
       // Account for the AR header alignment