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 7da729904420c24a6bc76351388097d8bf99870d..06318d94f79693261f90c46c1368189afe78e28e 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -12,43 +12,125 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <vector>
 
 #include <apt-pkg/packagemanager.h>
 #include <vector>

+#include <map>

 #include <stdio.h>
 #include <stdio.h>

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

 
 

+#ifndef APT_8_CLEANER_HEADERS

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

+using std::map;
+#endif
+
+class pkgDPkgPMPrivate;
+

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

+   private:
+   pkgDPkgPMPrivate *d;
+
+   /** \brief record the disappear action and handle accordingly
+
+      dpkg let packages disappear then they have no files any longer and
+      nothing depends on them. We need to collect this as dpkg as well as
+      APT doesn't know beforehand that the package will disappear, so the
+      only possible option is to tell the user afterwards about it.
+      To enhance the experience we also try to forward the auto-install
+      flag so the disappear-causer(s) are not autoremoved next time -
+      for the transfer to happen the disappeared version needs to depend
+      on the package the flag should be forwarded to and this package
+      needs to declare a Replaces on the disappeared package.
+      \param pkgname Name of the package that disappeared
+   */
+   void handleDisappearAction(std::string const &pkgname);
+

    protected:
    protected:

+   int pkgFailures;

 
 

-   // 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
+   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")
+   std::map<std::string,unsigned int> PackageOpsDone;
+
+   // progress reporting
+   unsigned int PackagesDone;
+   unsigned int PackagesTotal;
+  

    struct Item
    {
    struct Item
    {

-      enum Ops {Install, Configure, Remove, Purge} Op;
-      string File;
+      enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
+      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
 
    // Helpers

-   bool RunScripts(const char *Cnf);

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

-   bool SendV2Pkgs(FILE *F);
+   __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 WriteApportReport(const char *pkgpath, const char *errormsg);
+
+   // dpkg log
+   bool OpenLog();
+   bool CloseLog();
+
+   // helper
+   void BuildPackagesProgressMap();
+   void StartPtyMagic();
+   void StopPtyMagic();
+   
+   // input processing
+   void DoStdin(int master);
+   void DoTerminalPty(int master);
+   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
 
    // 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);

+
+#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:


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

+void SigINT(int sig);
+

 #endif
 #endif