move the status-fd progress reporting out of the pkgDPkgPM class, at this point,...

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index b7b5a6def6243f877cf3056fa78901fe6a054fc1..1f4bbafc786cb768e1b50c95ac689fd0de973140 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -14,23 +14,20 @@
 #include <vector>
 #include <map>
 #include <stdio.h>
 #include <vector>
 #include <map>
 #include <stdio.h>

+#include <apt-pkg/macros.h>

 
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::vector;
 using std::map;
 using std::vector;
 using std::map;

+#endif
+
+class pkgDPkgPMPrivate;

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

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

 
    /** \brief record the disappear action and handle accordingly
 
 
    /** \brief record the disappear action and handle accordingly
 


@@ -45,7 +42,7 @@ class pkgDPkgPM : public pkgPackageManager
       needs to declare a Replaces on the disappeared package.
       \param pkgname Name of the package that disappeared
    */
       needs to declare a Replaces on the disappeared package.
       \param pkgname Name of the package that disappeared
    */

-   void handleDisappearAction(string const &pkgname);
+   void handleDisappearAction(std::string const &pkgname);

 
    protected:
    int pkgFailures;
 
    protected:
    int pkgFailures;


@@ -60,11 +57,11 @@ class pkgDPkgPM : public pkgPackageManager
    // 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
    // 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;
+   std::map<std::string,std::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")
    // 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;
+   std::map<std::string,unsigned int> PackageOpsDone;

 
    // progress reporting
    unsigned int PackagesDone;
 
    // progress reporting
    unsigned int PackagesDone;


@@ -73,19 +70,24 @@ class pkgDPkgPM : public pkgPackageManager
    struct Item
    {
       enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
    struct Item
    {
       enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;

-      string File;
+      std::string File;

       PkgIterator Pkg;
       PkgIterator Pkg;

-      Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
+      Item(Ops Op,PkgIterator Pkg,std::string File = "") : Op(Op),

             File(File), Pkg(Pkg) {};
       Item() {};
       
    };
             File(File), Pkg(Pkg) {};
       Item() {};
       
    };

-   vector<Item> List;
+   std::vector<Item> List;

 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);

-   bool SendV2Pkgs(FILE *F);
-   void WriteHistoryTag(string const &tag, string value);
+   __deprecated bool SendV2Pkgs(FILE *F);
+   bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
+   void WriteHistoryTag(std::string const &tag, std::string value);
+
+   // Terminal progress 
+   void SetupTerminalScrollArea(int nr_scrolled_rows);
+   void SendTerminalProgress(float percentage);

 
    // apport integration
    void WriteApportReport(const char *pkgpath, const char *errormsg);
 
    // apport integration
    void WriteApportReport(const char *pkgpath, const char *errormsg);


@@ -97,14 +99,15 @@ class pkgDPkgPM : public pkgPackageManager
    // input processing
    void DoStdin(int master);
    void DoTerminalPty(int master);
    // input processing
    void DoStdin(int master);
    void DoTerminalPty(int master);

-   void DoDpkgStatusFd(int statusfd, int OutStatusFd);
-   void ProcessDpkgStatusLine(int OutStatusFd, char *line);
+   void DoDpkgStatusFd(int statusfd);
+   void ProcessDpkgStatusLine(char *line);

 
    // The Actuall installation implementation
 
    // The Actuall installation implementation

-   virtual bool Install(PkgIterator Pkg,string File);
+   virtual bool Install(PkgIterator Pkg,std::string File);

    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);

-   virtual bool Go(int StatusFd=-1);
+
+   virtual bool Go(APT::Progress::PackageManager *progress);

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


@@ -113,4 +116,6 @@ class pkgDPkgPM : public pkgPackageManager
    virtual ~pkgDPkgPM();
 };
 
    virtual ~pkgDPkgPM();
 };
 

+void SigINT(int sig);
+

 #endif
 #endif