diff options
Diffstat (limited to 'apt-inst/contrib')
| -rw-r--r-- | apt-inst/contrib/arfile.cc | 15 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 6d937df6d..27d4d9ba4 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.4 2002/09/20 05:30:33 tausq Exp $ +// $Id: arfile.cc,v 1.5 2003/02/10 00:36:12 doogie Exp $ /* ###################################################################### AR File - Handle an 'AR' archive @@ -17,6 +17,7 @@ #ifdef __GNUG__ #pragma implementation "apt-pkg/arfile.h" #endif +#include <apti18n.h> #include <apt-pkg/arfile.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> @@ -69,7 +70,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 +78,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 +90,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")); } // Check for an extra long name string @@ -101,7 +102,7 @@ bool ARArchive::LoadHeaders() Len >= strlen(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; @@ -127,11 +128,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; } diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 41cc9c8ec..fcfc89927 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: extracttar.cc,v 1.6 2002/11/11 06:55:50 doogie Exp $ +// $Id: extracttar.cc,v 1.7 2003/02/10 00:36:12 doogie Exp $ /* ###################################################################### Extract a Tar - Tar Extractor @@ -19,6 +19,7 @@ #ifdef __GNUG__ #pragma implementation "apt-pkg/extracttar.h" #endif +#include <apti18n.h> #include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> @@ -111,7 +112,7 @@ bool ExtractTar::StartGzip() { int Pipes[2]; if (pipe(Pipes) != 0) - return _error->Errno("pipe","Failed to create pipes"); + return _error->Errno("pipe",_("Failed to create pipes")); // Fork off the process GZPid = ExecFork(); @@ -136,7 +137,7 @@ bool ExtractTar::StartGzip() Args[1] = "-d"; Args[2] = 0; execv(Args[0],(char **)Args); - cerr << "Failed to exec gzip " << Args[0] << endl; + cerr << _("Failed to exec gzip ") << Args[0] << endl; _exit(100); } @@ -173,7 +174,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) TarHeader *Tar = (TarHeader *)Block; unsigned long CheckSum; if (StrToNum(Tar->Checksum,CheckSum,sizeof(Tar->Checksum),8) == false) - return _error->Error("Corrupted archive"); + return _error->Error(_("Corrupted archive")); /* Compute the checksum field. The actual checksum is blanked out with spaces so it is not included in the computation */ @@ -188,7 +189,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) return Done(true); if (NewSum != CheckSum) - return _error->Error("Tar Checksum failed, archive corrupted"); + return _error->Error(_("Tar Checksum failed, archive corrupted")); // Decode all of the fields pkgDirStream::Item Itm; @@ -199,7 +200,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) StrToNum(Tar->MTime,Itm.MTime,sizeof(Tar->MTime),8) == false || StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false || StrToNum(Tar->Minor,Itm.Minor,sizeof(Tar->Minor),8) == false) - return _error->Error("Corrupted archive"); + return _error->Error(_("Corrupted archive")); // Grab the filename if (LastLongName.empty() == false) @@ -291,7 +292,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) default: BadRecord = true; - _error->Warning("Unkown TAR header type %u, member %s",(unsigned)Tar->LinkFlag,Tar->Name); + _error->Warning(_("Unkown TAR header type %u, member %s"),(unsigned)Tar->LinkFlag,Tar->Name); break; } |