support running "--simulate" as user

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 3f0efab4f47f78ed136714522d92d21d51c830d4..f732c0b8600f227bd98e0fb088038aea4383e8c8 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.14 2001/03/11 22:37:35 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 
 /* ######################################################################
 
    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;


@@ -51,12 +52,19 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // Open the source and destination files
    FileFd From(Path,FileFd::ReadOnly);
 
    // Open the source and destination files
    FileFd From(Path,FileFd::ReadOnly);
 

+   // if the file is empty, just rename it and return
+   if(From.Size() == 0) 
+   {
+      rename(Path.c_str(), Itm->DestFile.c_str());
+      return true;
+   }
+

    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
 
    // Fork gzip

-   int Process = ExecFork();
+   pid_t Process = ExecFork();

    if (Process == 0)
    {
       close(GzOut[0]);
    if (Process == 0)
    {
       close(GzOut[0]);


@@ -68,7 +76,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 +106,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;
       }


@@ -109,6 +118,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       if (To.Write(Buffer,Count) == false)
       {
         Failed = true;
       if (To.Write(Buffer,Count) == false)
       {
         Failed = true;

+        FromGz.Close();

         break;
       }      
    }
         break;
       }      
    }


@@ -128,21 +138,21 @@ 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;
    Res.Size = Buf.st_size;
    
    // Return a Done response
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;

-   Res.MD5Sum = Hash.MD5.Result();
+   Res.TakeHashes(Hash);

 
    URIDone(Res);
    
 
    URIDone(Res);
    


@@ -152,6 +162,8 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

+   setlocale(LC_ALL, "");
+

    GzipMethod Mth;
 
    Prog = strrchr(argv[0],'/');
    GzipMethod Mth;
 
    Prog = strrchr(argv[0],'/');