support running "--simulate" as user

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index af1ac465ef88ed380bd4a2a6afd50248d9239b0b..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.18 2004/01/07 20:39:38 mdz 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 


@@ -52,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)
       return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
 
    // Fork gzip
    int GzOut[2];   
    if (pipe(GzOut) < 0)
       return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
 
    // Fork gzip

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

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


@@ -111,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;
       }      
    }


@@ -154,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],'/');