diff options
| author | Michael Vogt <egon@bottom> | 2007-08-28 10:11:13 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2007-08-28 10:11:13 +0200 |
| commit | 7f3142149d1d1e5ef133d8f6603803cc681bbed9 (patch) | |
| tree | 477dea42d5acbc08c591d7d2f88e7a4ab20a3386 /apt-pkg/deb/dpkgpm.cc | |
| parent | c3a7357e82f58d5061485b422aac990fdccac164 (diff) | |
| parent | f3f7e00a6269af5d3d0ce3785765dc562be7941d (diff) | |
* apt-pkg/pkgcachegen.cc:
- increase default mmap size
* tests/local-repo:
- added local repository testcase
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 343e3d82f..bb7e4b40a 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -44,7 +44,8 @@ using namespace std; // --------------------------------------------------------------------- /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) - : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0), PackagesDone(0) + : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), + PackagesTotal(0), term_out(NULL) { } /*}}}*/ @@ -351,7 +352,7 @@ void pkgDPkgPM::DoStdin(int master) /* * read the terminal pty and write log */ -void pkgDPkgPM::DoTerminalPty(int master, FILE *term_out) +void pkgDPkgPM::DoTerminalPty(int master) { char term_buf[1024] = {0,}; @@ -567,7 +568,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) return _error->Error(_("Directory '%s' missing"), logdir.c_str()); string logfile_name = flCombine(logdir, _config->Find("Dir::Log::Terminal")); - FILE *term_out = NULL; if (!logfile_name.empty()) { term_out = fopen(logfile_name.c_str(),"a"); @@ -778,9 +778,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) int _dpkgin = fd[0]; close(fd[1]); // close the write end of the pipe - // the read buffers for the communication with dpkg - char buf[2] = {0,0}; - // the result of the waitpid call int res; if(slave > 0) @@ -820,7 +817,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) continue; if(master >= 0 && FD_ISSET(master, &rfds)) - DoTerminalPty(master, term_out); + DoTerminalPty(master); if(master >= 0 && FD_ISSET(0, &rfds)) DoStdin(master); if(FD_ISSET(_dpkgin, &rfds)) |