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 eb708271e2c22c6b1853b72372a1722291bffdf2..2dee1a40d88ac149b1409733a97dba55a8f03a6a 100644 (file)
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: arfile.cc,v 1.7 2004/01/07 20:39:37 mdz Exp $
+// $Id: arfile.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    AR File - Handle an 'AR' archive
 /* ######################################################################
 
    AR File - Handle an 'AR' archive


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

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

 #include <apt-pkg/arfile.h>
 #include <apt-pkg/strutl.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 <apt-pkg/error.h>
 
 #include <stdlib.h>

-                                                                       /*}}}*/
+

 #include <apti18n.h>
 #include <apti18n.h>

+                                                                       /*}}}*/

 
 struct ARArchive::MemberHeader
 {
 
 struct ARArchive::MemberHeader
 {


@@ -90,7 +91,7 @@ bool ARArchive::LoadHeaders()
          StrToNum(Head.Size,Memb->Size,sizeof(Head.Size)) == false)
       {
         delete Memb;
          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
       }
         
       // Check for an extra long name string


@@ -99,7 +100,7 @@ bool ARArchive::LoadHeaders()
         char S[300];
         unsigned long Len;
         if (StrToNum(Head.Name+3,Len,sizeof(Head.Size)-3) == false ||
         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"));
         {
            delete Memb;
            return _error->Error(_("Invalid archive member header"));


@@ -114,8 +115,8 @@ bool ARArchive::LoadHeaders()
       else
       {
         unsigned int I = sizeof(Head.Name) - 1;
       else
       {
         unsigned int I = sizeof(Head.Name) - 1;

-        for (; Head.Name[I] == ' '; I--);
-        Memb->Name = string(Head.Name,I+1);
+        for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
+        Memb->Name = std::string(Head.Name,I+1);

       }
 
       // Account for the AR header alignment 
       }
 
       // Account for the AR header alignment