* apt-ftparchive might write corrupt Release files (LP: #46439)

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index c552b20c9bf9c892496050bf352f6aac3888cf9f..ebc7e32bf9fc3c3ddf204b66708363fc152a308b 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -23,10 +23,13 @@ class pkgDPkgPM : public pkgPackageManager
 {
    private:
 
 {
    private:
 

+   bool stdin_is_dev_null;
+

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

-
+   FILE *term_out;
+   

    protected:
 
    // progress reporting
    protected:
 
    // progress reporting


@@ -43,10 +46,10 @@ class pkgDPkgPM : public pkgPackageManager
    // 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,int> PackageOpsDone;
+   map<string,unsigned int> PackageOpsDone;

    // progress reporting
    // progress reporting

-   int PackagesDone;
-   int PackagesTotal;
+   unsigned int PackagesDone;
+   unsigned int PackagesTotal;

   
    struct Item
    {
   
    struct Item
    {


@@ -61,13 +64,16 @@ class pkgDPkgPM : public pkgPackageManager
    vector<Item> List;
 
    // Helpers
    vector<Item> List;
 
    // Helpers

-   bool RunScripts(const char *Cnf);

    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 

+   // dpkg log
+   bool OpenLog();
+   bool CloseLog();
+   

    // input processing
    void DoStdin(int master);
    // input processing
    void DoStdin(int master);

-   void DoTerminalPty(int master, FILE *out);
+   void DoTerminalPty(int master);

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