X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e9b0cab795afa27f50ee30708e090962a806c6fa..c307a4f0aa29c9c52a0e028524d21b448a53d09b:/apt-inst/contrib/arfile.cc

diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 9237b28d9..2dee1a40d 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: arfile.cc,v 1.3 2002/09/20 04:42:25 tausq Exp $
+// $Id: arfile.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $
 /* ######################################################################
 
    AR File - Handle an 'AR' archive
@@ -14,14 +14,16 @@
    ##################################################################### */
 									/*}}}*/
 // 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/fileutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdlib.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 struct ARArchive::MemberHeader
@@ -69,7 +71,7 @@ bool ARArchive::LoadHeaders()
    if (File.Read(Magic,sizeof(Magic)) == false)
       return false;
    if (memcmp(Magic,"!<arch>\012",sizeof(Magic)) != 0)
-      return _error->Error("Invalid archive signature");
+      return _error->Error(_("Invalid archive signature"));
    Left -= sizeof(Magic);
    
    // Read the member list
@@ -77,7 +79,7 @@ bool ARArchive::LoadHeaders()
    {
       MemberHeader Head;
       if (File.Read(&Head,sizeof(Head)) == false)
-	 return _error->Error("Error reading archive member header");
+	 return _error->Error(_("Error reading archive member header"));
       Left -= sizeof(Head);
 
       // Convert all of the integer members
@@ -89,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
@@ -98,10 +100,10 @@ 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");
+	    return _error->Error(_("Invalid archive member header"));
 	 }
 	 if (File.Read(S,Len) == false)
 	    return false;
@@ -114,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,0,I+1);
+	 Memb->Name = std::string(Head.Name,I+1);
       }
 
       // Account for the AR header alignment 
@@ -127,11 +129,11 @@ bool ARArchive::LoadHeaders()
       if (File.Skip(Memb->Size + Skip) == false)
 	 return false;
       if (Left < (signed)(Memb->Size + Skip))
-	 return _error->Error("Archive is too short");
+	 return _error->Error(_("Archive is too short"));
       Left -= Memb->Size + Skip;
    }   
    if (Left != 0)
-      return _error->Error("Failed to read the archive headers");
+      return _error->Error(_("Failed to read the archive headers"));
    
    return true;
 }