Release 1.3~exp3

[apt.git] / ftparchive / multicompress.cc

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 1555d2f2d3182d9b857088513d1eb395984d0205..3ffc5266ee22f8d9547fa7465017b52d20c00b0f 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -20,13 +20,15 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/hashsum_template.h>
 
-#include <fcntl.h>
+#include <ctype.h>
+#include <vector>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <iostream>
 
 #include "multicompress.h"
 #include <apti18n.h>
@@ -44,7 +46,6 @@ MultiCompress::MultiCompress(string const &Output,string const &Compress,
 {
    Outputs = 0;
    Outputter = -1;
-   Input = 0;
    UpdateMTime = 0;
 
    /* Parse the compression string, a space separated lists of compresison
@@ -185,12 +186,11 @@ bool MultiCompress::Start()
    };
 
    close(Pipe[0]);
-   Input = fdopen(Pipe[1],"w");
-   if (Input == 0)
-      return _error->Errno("fdopen",_("Failed to create FILE*"));
-   
+   if (Input.OpenDescriptor(Pipe[1], FileFd::WriteOnly, true) == false)
+      return false;
+
    if (Outputter == -1)
-      return _error->Errno("fork",_("Failed to fork"));   
+      return _error->Errno("fork",_("Failed to fork"));
    return true;
 }
                                                                        /*}}}*/
@@ -199,11 +199,10 @@ bool MultiCompress::Start()
 /* */
 bool MultiCompress::Die()
 {
-   if (Input == 0)
+   if (Input.IsOpen() == false)
       return true;
-   
-   fclose(Input);
-   Input = 0;
+
+   Input.Close();
    bool Res = ExecWait(Outputter,_("Compress child"),false);
    Outputter = -1;
    return Res;
@@ -215,7 +214,7 @@ bool MultiCompress::Die()
 bool MultiCompress::Finalize(unsigned long long &OutSize)
 {
    OutSize = 0;
-   if (Input == 0 || Die() == false)
+   if (Input.IsOpen() == false || Die() == false)
       return false;
    
    time_t Now;
@@ -353,9 +352,7 @@ bool MultiCompress::Child(int const &FD)
         for (Files *I = Outputs; I != 0; I = I->Next)
         {
            I->TmpFile.Close();
-           if (unlink(I->TmpFile.Name().c_str()) != 0)
-              _error->Errno("unlink",_("Problem unlinking %s"),
-                            I->TmpFile.Name().c_str());
+           RemoveFile("MultiCompress::Child", I->TmpFile.Name());
         }
         return !_error->PendingError();
       }