* make apt -Wall clean

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 8bfdff5eb6f44d08a643b4b892dd010e461eb517..065c6c917858a34df92c4a31e6acbfa794318b3b 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -10,20 +10,44 @@
 #ifndef PKGLIB_DPKGPM_H
 #define PKGLIB_DPKGPM_H
 
 #ifndef PKGLIB_DPKGPM_H
 #define PKGLIB_DPKGPM_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/dpkgpm.h"
-#endif
-

 #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
 {
 
 class pkgDPkgPM : public pkgPackageManager
 {

+   private:
+
+   // the buffer we use for the dpkg status-fd reading
+   char dpkgbuf[1024];
+   int dpkgbuf_pos;
+

    protected:
    protected:

-   
+
+   // progress reporting
+   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;


@@ -41,11 +65,17 @@ class pkgDPkgPM : public pkgPackageManager
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 

+   // input processing
+   void DoStdin(int master);
+   void DoTerminalPty(int master, FILE *out);
+   void DoDpkgStatusFd(int statusfd, int OutStatusFd);
+   void ProcessDpkgStatusLine(int OutStatusFd, char *line);
+

    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);

-   virtual bool Go(int status_fd=-1);
+   virtual bool Go(int StatusFd=-1);

    virtual void Reset();
    
    public:
    virtual void Reset();
    
    public: