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 8018f4d30792dd99a4fc67da30850f05081edce1..2dee1a40d88ac149b1409733a97dba55a8f03a6a 100644 (file)
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -14,13 +14,17 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#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
 {


@@ -112,7 +116,7 @@ bool ARArchive::LoadHeaders()
       {
         unsigned int I = sizeof(Head.Name) - 1;
         for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
       {
         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 
       }
 
       // Account for the AR header alignment