move pty magic into its own functions

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 29901a20446edbf888ea5b8be79db93097f2e593..06318d94f79693261f90c46c1368189afe78e28e 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -15,6 +15,7 @@
 #include <map>
 #include <stdio.h>
 #include <apt-pkg/macros.h>
 #include <map>
 #include <stdio.h>
 #include <apt-pkg/macros.h>

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

 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;


@@ -23,6 +24,7 @@ using std::map;
 
 class pkgDPkgPMPrivate;
 
 
 class pkgDPkgPMPrivate;
 

+

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


@@ -83,7 +85,11 @@ class pkgDPkgPM : public pkgPackageManager
    __deprecated bool SendV2Pkgs(FILE *F);
    bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
    void WriteHistoryTag(std::string const &tag, std::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);

+   std::string ExpandShortPackageName(pkgDepCache &Cache,
+                                      const std::string &short_pkgname);

 
 

+   // Terminal progress 
+   void SetupTerminalScrollArea(int nr_scrolled_rows);

    void SendTerminalProgress(float percentage);
 
    // apport integration
    void SendTerminalProgress(float percentage);
 
    // apport integration


@@ -92,18 +98,39 @@ class pkgDPkgPM : public pkgPackageManager
    // dpkg log
    bool OpenLog();
    bool CloseLog();
    // dpkg log
    bool OpenLog();
    bool CloseLog();

+
+   // helper
+   void BuildPackagesProgressMap();
+   void StartPtyMagic();
+   void StopPtyMagic();

    
    // 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);
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+   void DoDpkgStatusFd(int statusfd, int unused) {
+      DoDpkgStatusFd(statusfd);
+   }
+   void ProcessDpkgStatusLine(int unused, char *line) {
+      ProcessDpkgStatusLine(line);
+   }
+#endif
+

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

+
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   virtual bool Go(APT::Progress::PackageManager *progress);
+#else

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

+   bool GoNoABIBreak(APT::Progress::PackageManager *progress);
+#endif
+

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