* apt-ftparchive might write corrupt Release files (LP: #46439)

[apt.git] / apt-pkg / deb / dpkgpm.h

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index f47cd0bd8976366ac6b367d37355f531873ef4f9..ebc7e32bf9fc3c3ddf204b66708363fc152a308b 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -12,25 +12,45 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <vector>
 
 #include <apt-pkg/packagemanager.h>
 #include <vector>

+#include <map>

 #include <stdio.h>
 
 using std::vector;
 #include <stdio.h>
 
 using std::vector;

+using std::map;
+

 
 class pkgDPkgPM : public pkgPackageManager
 {
    private:
 
 class pkgDPkgPM : public pkgPackageManager
 {
    private:

-   int dpkgbuf_pos;
-   char dpkgbuf[1024];

 
 

+   bool stdin_is_dev_null;
+
+   // the buffer we use for the dpkg status-fd reading
+   char dpkgbuf[1024];
+   int dpkgbuf_pos;
+   FILE *term_out;
+   

    protected:
 
    protected:
 

-   // used for progress reporting
+   // progress reporting

    struct DpkgState 
    {
       const char *state;     // the dpkg state (e.g. "unpack")
       const char *str;       // the human readable translation of the state
    };
    struct DpkgState 
    {
       const char *state;     // the dpkg state (e.g. "unpack")
       const char *str;       // the human readable translation of the state
    };

-   
+
+   // the dpkg states that the pkg will run through, the string is 
+   // the package, the vector contains the dpkg states that the package
+   // will go through
+   map<string,vector<struct DpkgState> > PackageOps;
+   // the dpkg states that are already done; the string is the package
+   // the int is the state that is already done (e.g. a package that is
+   // going to be install is already in state "half-installed")
+   map<string,unsigned int> PackageOpsDone;
+   // progress reporting
+   unsigned int PackagesDone;
+   unsigned int PackagesTotal;
+  

    struct Item
    {
       enum Ops {Install, Configure, Remove, Purge} Op;
    struct Item
    {
       enum Ops {Install, Configure, Remove, Purge} Op;


@@ -44,16 +64,18 @@ class pkgDPkgPM : public pkgPackageManager
    vector<Item> List;
 
    // Helpers
    vector<Item> List;
 
    // Helpers

-   bool RunScripts(const char *Cnf);

    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 

+   // dpkg log
+   bool OpenLog();
+   bool CloseLog();
+   

    // input processing
    void DoStdin(int master);
    // input processing
    void DoStdin(int master);

-   void DoTerminalPty(int master, FILE *out);
-   void DoDpkgStatusFd(int statusfd);
-   void ProcessDpkgStatusLine(char *line);
-
+   void DoTerminalPty(int master);
+   void DoDpkgStatusFd(int statusfd, int OutStatusFd);
+   void ProcessDpkgStatusLine(int OutStatusFd, char *line);

 
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
 
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);