summaryrefslogtreecommitdiff
path: root/apt-pkg/deb/dpkgpm.h
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2012-04-16 19:24:07 +0200
committerMichael Vogt <egon@debian-devbox>2012-04-16 19:24:07 +0200
commit443f5e8a3205162ec6933529c5ca0c95ad3f6941 (patch)
tree3e2da22dcecc8eeaabc1ac5ceac0407a8e3cc25f /apt-pkg/deb/dpkgpm.h
parent96273866174c54bdb25813633891f29668d43848 (diff)
parentf352743312edeebf666e1c8304cdc4baf457469f (diff)
merge from the expermental2 branch
Diffstat (limited to 'apt-pkg/deb/dpkgpm.h')
-rw-r--r--apt-pkg/deb/dpkgpm.h31
1 files changed, 14 insertions, 17 deletions
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index b7b5a6def..aab39f633 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -15,22 +15,17 @@
#include <map>
#include <stdio.h>
+#ifndef APT_8_CLEANER_HEADERS
using std::vector;
using std::map;
+#endif
+class pkgDPkgPMPrivate;
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
@@ -45,7 +40,7 @@ class pkgDPkgPM : public pkgPackageManager
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;
@@ -60,11 +55,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
- 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")
- map<string,unsigned int> PackageOpsDone;
+ std::map<std::string,unsigned int> PackageOpsDone;
// progress reporting
unsigned int PackagesDone;
@@ -73,19 +68,19 @@ class pkgDPkgPM : public pkgPackageManager
struct Item
{
enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
- string File;
+ std::string File;
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() {};
};
- vector<Item> List;
+ std::vector<Item> List;
// Helpers
bool RunScriptsWithPkgs(const char *Cnf);
bool SendV2Pkgs(FILE *F);
- void WriteHistoryTag(string const &tag, string value);
+ void WriteHistoryTag(std::string const &tag, std::string value);
// apport integration
void WriteApportReport(const char *pkgpath, const char *errormsg);
@@ -101,7 +96,7 @@ class pkgDPkgPM : public pkgPackageManager
void ProcessDpkgStatusLine(int OutStatusFd, char *line);
// 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 Go(int StatusFd=-1);
@@ -113,4 +108,6 @@ class pkgDPkgPM : public pkgPackageManager
virtual ~pkgDPkgPM();
};
+void SigINT(int sig);
+
#endif