Merge apt--authentication--0

[ntk/apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index c0092c7..75a0389 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: gzip.cc,v 1.13 2001/03/11 05:30:20 jgg Exp $
+// $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 
@@ -20,8 +20,11 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
+#include <apti18n.h>
                                                                        /*}}}*/
 
+const char *Prog;
+
 class GzipMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
@@ -34,13 +37,14 @@ class GzipMethod : public pkgAcqMethod
 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------
-/* This forks gzip and hashes the resulting decompressed output as it
-   flows to the destination file */
+/* */
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
    string Path = Get.Host + Get.Path; // To account for relative paths
    
+   string GzPathOption = "Dir::bin::"+string(Prog);
+
    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);
@@ -50,7 +54,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
    int GzOut[2];   
    if (pipe(GzOut) < 0)
-      return _error->Errno("pipe","Couldn't open pipe for gzip");
+      return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
 
    // Fork gzip
    int Process = ExecFork();
@@ -65,7 +69,8 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       SetCloseExec(STDOUT_FILENO,false);
       
       const char *Args[3];
-      Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
+      string Tmp = _config->Find(GzPathOption,Prog);
+      Args[0] = Tmp.c_str();
       Args[1] = "-d";
       Args[2] = 0;
       execvp(Args[0],(char **)Args);
@@ -94,7 +99,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       
       if (Count < 0)
       {
-        _error->Errno("read", "Read error from gzip process");
+        _error->Errno("read", _("Read error from %s process"),Prog);
         Failed = true;
         break;
       }
@@ -104,14 +109,14 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       
       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
-      {         
+      {
         Failed = true;
         break;
-      }         
+      }      
    }
    
    // Wait for gzip to finish
-   if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
+   if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false)
    {
       To.OpFail();
       return false;
@@ -125,21 +130,21 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // 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)
-      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)
-      return _error->Errno("stat","Failed to stat");
+      return _error->Errno("stat",_("Failed to stat"));
    
    // Return a Done response
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
-   Res.MD5Sum = Hash.MD5.Result();
+   Res.TakeHashes(Hash);
 
    URIDone(Res);
    
@@ -147,8 +152,14 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
-int main()
+int main(int argc, char *argv[])
 {
+   setlocale(LC_ALL, "");
+
    GzipMethod Mth;
+
+   Prog = strrchr(argv[0],'/');
+   Prog++;
+   
    return Mth.Run();
 }