Open 0.5.30

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

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index f8bd109ce5aef498eab7dea950856c507e8e4107..63bb2ba804ba53827512e0a0920798bd8db531e4 100644 (file)
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: extracttar.cc,v 1.3 2001/05/27 23:47:09 jgg Exp $
+// $Id: extracttar.cc,v 1.9 2004/01/07 20:39:37 mdz Exp $

 /* ######################################################################
 
    Extract a Tar - Tar Extractor
 /* ######################################################################
 
    Extract a Tar - Tar Extractor


@@ -30,9 +30,12 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>

-#include <iostream.h>
+#include <iostream>
+#include <apti18n.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using namespace std;
+    

 // The on disk header for a tar file.
 struct ExtractTar::TarHeader
 {
 // The on disk header for a tar file.
 struct ExtractTar::TarHeader
 {


@@ -69,7 +72,8 @@ ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max) : File(Fd),
 /* */
 ExtractTar::~ExtractTar()
 {
 /* */
 ExtractTar::~ExtractTar()
 {

-   Done(false);
+   // Error close
+   Done(true);

 }
                                                                        /*}}}*/
 // ExtractTar::Done - Reap the gzip sub process                                /*{{{*/
 }
                                                                        /*}}}*/
 // ExtractTar::Done - Reap the gzip sub process                                /*{{{*/


@@ -109,7 +113,7 @@ bool ExtractTar::StartGzip()
 {
    int Pipes[2];
    if (pipe(Pipes) != 0)
 {
    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();
    
    // Fork off the process
    GZPid = ExecFork();


@@ -134,7 +138,7 @@ bool ExtractTar::StartGzip()
       Args[1] = "-d";
       Args[2] = 0;
       execv(Args[0],(char **)Args);
       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);
    }
 
       _exit(100);
    }
 


@@ -171,7 +175,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       TarHeader *Tar = (TarHeader *)Block;
       unsigned long CheckSum;
       if (StrToNum(Tar->Checksum,CheckSum,sizeof(Tar->Checksum),8) == false)
       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 */
       
       /* Compute the checksum field. The actual checksum is blanked out
          with spaces so it is not included in the computation */


@@ -186,20 +190,18 @@ bool ExtractTar::Go(pkgDirStream &Stream)
         return Done(true);
       
       if (NewSum != CheckSum)
         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;
    
       // Decode all of the fields
       pkgDirStream::Item Itm;

-      unsigned long UID;
-      unsigned long GID;

       if (StrToNum(Tar->Mode,Itm.Mode,sizeof(Tar->Mode),8) == false ||
       if (StrToNum(Tar->Mode,Itm.Mode,sizeof(Tar->Mode),8) == false ||

-         StrToNum(Tar->UserID,UID,sizeof(Tar->UserID),8) == false ||
-         StrToNum(Tar->GroupID,GID,sizeof(Tar->GroupID),8) == false ||
+         StrToNum(Tar->UserID,Itm.UID,sizeof(Tar->UserID),8) == false ||
+         StrToNum(Tar->GroupID,Itm.GID,sizeof(Tar->GroupID),8) == false ||

          StrToNum(Tar->Size,Itm.Size,sizeof(Tar->Size),8) == false ||
          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)
          StrToNum(Tar->Size,Itm.Size,sizeof(Tar->Size),8) == false ||
          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)
       
       // Grab the filename
       if (LastLongName.empty() == false)


@@ -291,7 +293,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
         
         default:
         BadRecord = true;
         
         default:
         BadRecord = true;

-        _error->Warning("Unkown TAR header type %u, member %s",(unsigned)Tar->LinkFlag,Tar->Name);
+        _error->Warning(_("Unknown TAR header type %u, member %s"),(unsigned)Tar->LinkFlag,Tar->Name);

         break;
       }
       
         break;
       }