* Patch from Eric Wong <normalperson@yhbt.net> to inclu...

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 35ff692f4406c5604e67ad85944795cddceef96b..af1ac465ef88ed380bd4a2a6afd50248d9239b0b 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: gzip.cc,v 1.15 2001/03/13 06:51:46 jgg Exp $
+// $Id: gzip.cc,v 1.18 2004/01/07 20:39:38 mdz Exp $

 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 


@@ -20,6 +20,7 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>

+#include <apti18n.h>

                                                                        /*}}}*/
 
 const char *Prog;
                                                                        /*}}}*/
 
 const char *Prog;


@@ -53,7 +54,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
    int GzOut[2];   
    if (pipe(GzOut) < 0)
 
    int GzOut[2];   
    if (pipe(GzOut) < 0)

-      return _error->Errno("pipe","Couldn't open pipe for %s",Prog);
+      return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);

 
    // Fork gzip
    int Process = ExecFork();
 
    // Fork gzip
    int Process = ExecFork();


@@ -68,7 +69,8 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       SetCloseExec(STDOUT_FILENO,false);
       
       const char *Args[3];
       SetCloseExec(STDOUT_FILENO,false);
       
       const char *Args[3];

-      Args[0] = _config->Find(GzPathOption,Prog).c_str();
+      string Tmp = _config->Find(GzPathOption,Prog);
+      Args[0] = Tmp.c_str();

       Args[1] = "-d";
       Args[2] = 0;
       execvp(Args[0],(char **)Args);
       Args[1] = "-d";
       Args[2] = 0;
       execvp(Args[0],(char **)Args);


@@ -97,7 +99,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       
       if (Count < 0)
       {
       
       if (Count < 0)
       {

-        _error->Errno("read", "Read error from %s process",Prog);
+        _error->Errno("read", _("Read error from %s process"),Prog);

         Failed = true;
         break;
       }
         Failed = true;
         break;
       }


@@ -128,16 +130,16 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // Transfer the modification times
    struct stat Buf;
    if (stat(Path.c_str(),&Buf) != 0)
    // Transfer the modification times
    struct stat Buf;
    if (stat(Path.c_str(),&Buf) != 0)

-      return _error->Errno("stat","Failed to stat");
+      return _error->Errno("stat",_("Failed to stat"));

 
    struct utimbuf TimeBuf;
    TimeBuf.actime = Buf.st_atime;
    TimeBuf.modtime = Buf.st_mtime;
    if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
 
    struct utimbuf TimeBuf;
    TimeBuf.actime = Buf.st_atime;
    TimeBuf.modtime = Buf.st_mtime;
    if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)

-      return _error->Errno("utime","Failed to set modification time");
+      return _error->Errno("utime",_("Failed to set modification time"));

 
    if (stat(Itm->DestFile.c_str(),&Buf) != 0)
 
    if (stat(Itm->DestFile.c_str(),&Buf) != 0)

-      return _error->Errno("stat","Failed to stat");
+      return _error->Errno("stat",_("Failed to stat"));

    
    // Return a Done response
    Res.LastModified = Buf.st_mtime;
    
    // Return a Done response
    Res.LastModified = Buf.st_mtime;