From d8cb4aa44573aca621110fda47d72bd682c0e3f4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 3 Jul 2007 21:38:32 +0200 Subject: * first (raw and ineffient) implementation --- apt-pkg/deb/dpkgpm.cc | 77 +++++++++++++++++++++++++++++++++++++++++++++++---- apt-pkg/makefile | 2 +- cmdline/makefile | 2 +- 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index e5506d3bf..9ca519acd 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -25,6 +25,11 @@ #include #include +#include +#include +#include +#include + #include #include /*}}}*/ @@ -516,7 +521,24 @@ bool pkgDPkgPM::Go(int OutStatusFd) it doesn't die but we do! So we must also ignore it */ sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN); sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN); - + + struct termios tt; + struct winsize win; + int master; + int slave; + + tcgetattr(0, &tt); + ioctl(0, TIOCGWINSZ, (char *)&win); + if (openpty(&master, &slave, NULL, &tt, &win) < 0) { + fprintf(stderr, _("openpty failed\n")); + } + + struct termios rtt; + rtt = tt; + cfmakeraw(&rtt); + rtt.c_lflag &= ~ECHO; + tcsetattr(0, TCSAFLUSH, &rtt); + // Fork dpkg pid_t Child; _config->Set("APT::Keep-Fds::",fd[1]); @@ -525,8 +547,16 @@ bool pkgDPkgPM::Go(int OutStatusFd) // This is the child if (Child == 0) { + setsid(); + ioctl(slave, TIOCSCTTY, 0); + close(master); + dup2(slave, 0); + dup2(slave, 1); + dup2(slave, 2); + close(slave); + close(fd[0]); // close the read end of the pipe - + if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) _exit(100); @@ -545,7 +575,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (fcntl(STDIN_FILENO,F_SETFL,Flags & (~(long)O_NONBLOCK)) < 0) _exit(100); } - + + /* No Job Control Stop Env is a magic dpkg var that prevents it from using sigstop */ putenv("DPKG_NO_TSTP=yes"); @@ -567,11 +598,19 @@ bool pkgDPkgPM::Go(int OutStatusFd) // the read buffers for the communication with dpkg char line[1024] = {0,}; + char buf[2] = {0,0}; + char term_buf[2] = {0,0}; + char input_buf[2] = {0,0}; // the result of the waitpid call int res; - + close(slave); + fcntl(0, F_SETFL, O_NONBLOCK); + fcntl(master, F_SETFL, O_NONBLOCK); + FILE *term_out = fopen("/var/log/dpkg-out.log","a"); + chmod("/var/log/dpkg-out.log", 0600); + while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { if(res < 0) { // FIXME: move this to a function or something, looks ugly here @@ -585,18 +624,41 @@ bool pkgDPkgPM::Go(int OutStatusFd) signal(SIGINT,old_SIGINT); return _error->Errno("waitpid","Couldn't wait for subprocess"); } + + // wait for input or output here + + // FIXME: use select() instead of the rubish below // read a single char, make sure that the read can't block // (otherwise we may leave zombies) + int term_len = read(master, term_buf, 1); + int input_len = read(0, input_buf, 1); int len = read(_dpkgin, buf, 1); - // nothing to read, wait a bit for more + // see if we have any input that needs to go to the + // master pty + if(input_len > 0) + write(master, input_buf, 1); + + // see if we have any output that needs to be echoed + // and written to the log + if(term_len > 0) + { + do + { + fwrite(term_buf, 1, 1, term_out); + write(1, term_buf, 1); + } while(read(master, term_buf, 1) > 0); + term_buf[0] = 0; + } + + // nothing to read from dpkg , wait a bit for more if(len <= 0) { usleep(1000); continue; } - + // sanity check (should never happen) if(strlen(line) >= sizeof(line)-10) { @@ -702,10 +764,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) line[0]=0; } close(_dpkgin); + fclose(term_out); // Restore sig int/quit signal(SIGQUIT,old_SIGQUIT); signal(SIGINT,old_SIGINT); + + tcsetattr(0, TCSAFLUSH, &tt); // Check for an error code. if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) diff --git a/apt-pkg/makefile b/apt-pkg/makefile index df9954f67..8dd50b8c2 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -15,7 +15,7 @@ LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) MAJOR=4.4 MINOR=0 -SLIBS=$(PTHREADLIB) $(INTLLIBS) +SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil APT_DOMAIN:=libapt-pkg$(MAJOR) # Source code for the contributed non-core things diff --git a/cmdline/makefile b/cmdline/makefile index 49035be44..5820c2e0f 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -14,7 +14,7 @@ include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg -lutil LIB_MAKES = apt-pkg/makefile SOURCE = apt-get.cc acqprogress.cc include $(PROGRAM_H) -- cgit v1.2.3 From 090c6566327b0549e74ca50ed8aaae1a898407b2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 15 Jul 2007 10:30:30 +0100 Subject: apt-pkg/deb/dpkgpm.cc: - use select() to check for new data --- apt-pkg/deb/dpkgpm.cc | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 9ca519acd..d024f8a35 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -529,7 +530,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) tcgetattr(0, &tt); ioctl(0, TIOCGWINSZ, (char *)&win); - if (openpty(&master, &slave, NULL, &tt, &win) < 0) { + if (openpty(&master, &slave, NULL, &tt, &win) < 0) + { fprintf(stderr, _("openpty failed\n")); } @@ -608,9 +610,17 @@ bool pkgDPkgPM::Go(int OutStatusFd) close(slave); fcntl(0, F_SETFL, O_NONBLOCK); fcntl(master, F_SETFL, O_NONBLOCK); + // FIXME: make this a apt config option and add a logrotate file FILE *term_out = fopen("/var/log/dpkg-out.log","a"); chmod("/var/log/dpkg-out.log", 0600); - + + fd_set rfds; + struct timeval tv; + int select_ret; + FD_ZERO(&rfds); + FD_SET(0, &rfds); + FD_SET(_dpkgin, &rfds); + FD_SET(master, &rfds); while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { if(res < 0) { // FIXME: move this to a function or something, looks ugly here @@ -626,9 +636,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) } // wait for input or output here - - // FIXME: use select() instead of the rubish below - + tv.tv_sec = 1; + tv.tv_usec = 0; + select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, &rfds, &tv); + if (select_ret < 0) + std::cerr << "Error in select()" << std::endl; + else if (select_ret == 0) + continue; + // read a single char, make sure that the read can't block // (otherwise we may leave zombies) int term_len = read(master, term_buf, 1); -- cgit v1.2.3 From ceabc520928a2eadce005b4f6bcf1f1e703d6b49 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 15 Jul 2007 11:11:04 +0100 Subject: apt-pkg/deb/dpkgpm.{cc,h}: - move the terminal and stdin reading into its own functions --- apt-pkg/deb/dpkgpm.cc | 61 ++++++++++++++++++++++++++++++++------------------- apt-pkg/deb/dpkgpm.h | 5 +++++ 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index d024f8a35..be61be43b 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -329,7 +329,40 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) return true; } + + /*}}}*/ +// DPkgPM::DoStdin - Read stdin and pass to slave pty /*{{{*/ +// --------------------------------------------------------------------- +/* +*/ +void pkgDPkgPM::DoStdin(int master) +{ + char input_buf[2] = {0,0}; + while(read(0, input_buf, 1) > 0) + write(master, input_buf, 1); +} /*}}}*/ +// DPkgPM::DoTerminalPty - Read the terminal pty and write log /*{{{*/ +// --------------------------------------------------------------------- +/* + * read the terminal pty and write log + */ +void pkgDPkgPM::DoTerminalPty(int master, FILE *term_out) +{ + char term_buf[2] = {0,0}; + + // read a single char, make sure that the read can't block + // (otherwise we may leave zombies) + do + { + fwrite(term_buf, 1, 1, term_out); + write(1, term_buf, 1); + } while(read(master, term_buf, 1) > 0); +} + /*}}}*/ + + + // DPkgPM::Go - Run the sequence /*{{{*/ // --------------------------------------------------------------------- /* This globs the operations and calls dpkg @@ -528,6 +561,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) int master; int slave; + // FIXME: setup sensible signal handling (*ick*) tcgetattr(0, &tt); ioctl(0, TIOCGWINSZ, (char *)&win); if (openpty(&master, &slave, NULL, &tt, &win) < 0) @@ -602,8 +636,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) char line[1024] = {0,}; char buf[2] = {0,0}; - char term_buf[2] = {0,0}; - char input_buf[2] = {0,0}; // the result of the waitpid call int res; @@ -644,28 +676,11 @@ bool pkgDPkgPM::Go(int OutStatusFd) else if (select_ret == 0) continue; - // read a single char, make sure that the read can't block - // (otherwise we may leave zombies) - int term_len = read(master, term_buf, 1); - int input_len = read(0, input_buf, 1); - int len = read(_dpkgin, buf, 1); + DoStdin(master); + DoTerminalPty(master, term_out); + //DoDpkgStatusFd(); - // see if we have any input that needs to go to the - // master pty - if(input_len > 0) - write(master, input_buf, 1); - - // see if we have any output that needs to be echoed - // and written to the log - if(term_len > 0) - { - do - { - fwrite(term_buf, 1, 1, term_out); - write(1, term_buf, 1); - } while(read(master, term_buf, 1) > 0); - term_buf[0] = 0; - } + int len = read(_dpkgin, buf, 1); // nothing to read from dpkg , wait a bit for more if(len <= 0) diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 7da729904..a1466878d 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -44,6 +44,11 @@ class pkgDPkgPM : public pkgPackageManager bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); + // input processing + void DoStdin(int master); + void DoTerminalPty(int master, FILE *out); + // void DoDpkgStatusFd(); + // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); -- cgit v1.2.3 From 7fdafa0f344e236aeaeaa67708dbb70e10a80d98 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 15 Jul 2007 15:42:15 +0100 Subject: apt-pkg/deb/dpkgpm.cc: - unbreak progress reporting, make code nicer --- apt-pkg/deb/dpkgpm.cc | 211 +++++++++++++++++++++++++------------------------- 1 file changed, 104 insertions(+), 107 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index be61be43b..0d5e2b415 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -338,7 +338,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) void pkgDPkgPM::DoStdin(int master) { char input_buf[2] = {0,0}; - while(read(0, input_buf, 1) > 0) + while(read(0, input_buf, 1) > 0) write(master, input_buf, 1); } /*}}}*/ @@ -353,11 +353,11 @@ void pkgDPkgPM::DoTerminalPty(int master, FILE *term_out) // read a single char, make sure that the read can't block // (otherwise we may leave zombies) - do + while(read(master, term_buf, 1) > 0) { fwrite(term_buf, 1, 1, term_out); write(1, term_buf, 1); - } while(read(master, term_buf, 1) > 0); + } } /*}}}*/ @@ -634,7 +634,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) // the read buffers for the communication with dpkg char line[1024] = {0,}; - char buf[2] = {0,0}; // the result of the waitpid call @@ -670,7 +669,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // wait for input or output here tv.tv_sec = 1; tv.tv_usec = 0; - select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, &rfds, &tv); + select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv); if (select_ret < 0) std::cerr << "Error in select()" << std::endl; else if (select_ret == 0) @@ -680,118 +679,116 @@ bool pkgDPkgPM::Go(int OutStatusFd) DoTerminalPty(master, term_out); //DoDpkgStatusFd(); - int len = read(_dpkgin, buf, 1); - - // nothing to read from dpkg , wait a bit for more - if(len <= 0) + while(true) { - usleep(1000); - continue; - } + if(read(_dpkgin, buf, 1) <= 0) + break; - // sanity check (should never happen) - if(strlen(line) >= sizeof(line)-10) - { - _error->Error("got a overlong line from dpkg: '%s'",line); - line[0]=0; - } - // append to line, check if we got a complete line - strcat(line, buf); - if(buf[0] != '\n') - continue; + // sanity check (should never happen) + if(strlen(line) >= sizeof(line)-10) + { + _error->Error("got a overlong line from dpkg: '%s'",line); + line[0]=0; + continue; + } + // append to line, check if we got a complete line + strcat(line, buf); + if(buf[0] != '\n') + continue; - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "got from dpkg '" << line << "'" << std::endl; + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "got from dpkg '" << line << "'" << std::endl; - // the status we output - ostringstream status; + // the status we output + ostringstream status; - /* dpkg sends strings like this: - 'status: : ' - errors look like this: - 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data - and conffile-prompt like this - 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited + /* dpkg sends strings like this: + 'status: : ' + errors look like this: + 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data + and conffile-prompt like this + 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited - */ - char* list[5]; - // dpkg sends multiline error messages sometimes (see - // #374195 for a example. we should support this by - // either patching dpkg to not send multiline over the - // statusfd or by rewriting the code here to deal with - // it. for now we just ignore it and not crash - TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); - char *pkg = list[1]; - char *action = _strstrip(list[2]); - if( pkg == NULL || action == NULL) - { - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "ignoring line: not enough ':'" << std::endl; - // reset the line buffer - line[0]=0; - continue; - } + */ + char* list[5]; + // dpkg sends multiline error messages sometimes (see + // #374195 for a example. we should support this by + // either patching dpkg to not send multiline over the + // statusfd or by rewriting the code here to deal with + // it. for now we just ignore it and not crash + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); + char *pkg = list[1]; + char *action = _strstrip(list[2]); + if( pkg == NULL || action == NULL) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring line: not enough ':'" << std::endl; + // reset the line buffer + line[0]=0; + continue; + } - if(strncmp(action,"error",strlen("error")) == 0) - { - status << "pmerror:" << list[1] - << ":" << (Done/float(Total)*100.0) - << ":" << list[3] - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - line[0]=0; - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - continue; - } - if(strncmp(action,"conffile",strlen("conffile")) == 0) - { - status << "pmconffile:" << list[1] - << ":" << (Done/float(Total)*100.0) - << ":" << list[3] - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - line[0]=0; - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - continue; - } + if(strncmp(action,"error",strlen("error")) == 0) + { + status << "pmerror:" << list[1] + << ":" << (Done/float(Total)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + line[0]=0; + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + continue; + } + if(strncmp(action,"conffile",strlen("conffile")) == 0) + { + status << "pmconffile:" << list[1] + << ":" << (Done/float(Total)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + line[0]=0; + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + continue; + } - vector &states = PackageOps[pkg]; - const char *next_action = NULL; - if(PackageOpsDone[pkg] < states.size()) - next_action = states[PackageOpsDone[pkg]].state; - // check if the package moved to the next dpkg state - if(next_action && (strcmp(action, next_action) == 0)) - { - // only read the translation if there is actually a next - // action - const char *translation = _(states[PackageOpsDone[pkg]].str); - char s[200]; - snprintf(s, sizeof(s), translation, pkg); - - // we moved from one dpkg state to a new one, report that - PackageOpsDone[pkg]++; - Done++; - // build the status str - status << "pmstatus:" << pkg - << ":" << (Done/float(Total)*100.0) - << ":" << s - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; + vector &states = PackageOps[pkg]; + const char *next_action = NULL; + if(PackageOpsDone[pkg] < states.size()) + next_action = states[PackageOpsDone[pkg]].state; + // check if the package moved to the next dpkg state + if(next_action && (strcmp(action, next_action) == 0)) + { + // only read the translation if there is actually a next + // action + const char *translation = _(states[PackageOpsDone[pkg]].str); + char s[200]; + snprintf(s, sizeof(s), translation, pkg); + + // we moved from one dpkg state to a new one, report that + PackageOpsDone[pkg]++; + Done++; + // build the status str + status << "pmstatus:" << pkg + << ":" << (Done/float(Total)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; - } - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "(parsed from dpkg) pkg: " << pkg - << " action: " << action << endl; + } + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "(parsed from dpkg) pkg: " << pkg + << " action: " << action << endl; - // reset the line buffer - line[0]=0; + // reset the line buffer + line[0]=0; + } } close(_dpkgin); fclose(term_out); -- cgit v1.2.3 From 97efd303643092950042d4f66854c2c1238fa274 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 15 Jul 2007 17:38:22 +0100 Subject: apt-pkg/deb/dpkgpm.cc: - write current time to log --- apt-pkg/deb/dpkgpm.cc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 0d5e2b415..6270e49f3 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -590,7 +590,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) dup2(slave, 1); dup2(slave, 2); close(slave); - close(fd[0]); // close the read end of the pipe if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) @@ -641,10 +640,20 @@ bool pkgDPkgPM::Go(int OutStatusFd) close(slave); fcntl(0, F_SETFL, O_NONBLOCK); fcntl(master, F_SETFL, O_NONBLOCK); + // FIXME: make this a apt config option and add a logrotate file FILE *term_out = fopen("/var/log/dpkg-out.log","a"); chmod("/var/log/dpkg-out.log", 0600); - + // output current time + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "Log started: "); + fprintf(term_out, outstr); + fprintf(term_out, "\n"); + + // setups fds fd_set rfds; struct timeval tv; int select_ret; @@ -677,8 +686,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) DoStdin(master); DoTerminalPty(master, term_out); - //DoDpkgStatusFd(); + // FIXME: move this into its own function too + //DoDpkgStatusFd(); while(true) { if(read(_dpkgin, buf, 1) <= 0) -- cgit v1.2.3 From 955a6ddb8f3bcfadebee5694511661e71980b991 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 16 Jul 2007 09:19:45 +0100 Subject: apt-pkg/deb/dpkgpm.cc: - run DoStdin(), DoTerminalPty() calls only if their FD is in the returned set after select() --- apt-pkg/deb/dpkgpm.cc | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 6270e49f3..e78f2dc1c 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -337,9 +337,9 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) */ void pkgDPkgPM::DoStdin(int master) { - char input_buf[2] = {0,0}; - while(read(0, input_buf, 1) > 0) - write(master, input_buf, 1); + char input_buf[256] = {0,}; + int len = read(0, input_buf, sizeof(input_buf)); + write(master, input_buf, len); } /*}}}*/ // DPkgPM::DoTerminalPty - Read the terminal pty and write log /*{{{*/ @@ -349,15 +349,13 @@ void pkgDPkgPM::DoStdin(int master) */ void pkgDPkgPM::DoTerminalPty(int master, FILE *term_out) { - char term_buf[2] = {0,0}; + char term_buf[1024] = {0,}; - // read a single char, make sure that the read can't block - // (otherwise we may leave zombies) - while(read(master, term_buf, 1) > 0) - { - fwrite(term_buf, 1, 1, term_out); - write(1, term_buf, 1); - } + int len=read(master, term_buf, sizeof(term_buf)); + if(len <= 0) + return; + fwrite(term_buf, len, sizeof(char), term_out); + write(1, term_buf, len); } /*}}}*/ @@ -638,9 +636,10 @@ bool pkgDPkgPM::Go(int OutStatusFd) // the result of the waitpid call int res; close(slave); +#if 0 fcntl(0, F_SETFL, O_NONBLOCK); fcntl(master, F_SETFL, O_NONBLOCK); - +#endif // FIXME: make this a apt config option and add a logrotate file FILE *term_out = fopen("/var/log/dpkg-out.log","a"); chmod("/var/log/dpkg-out.log", 0600); @@ -657,10 +656,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) fd_set rfds; struct timeval tv; int select_ret; - FD_ZERO(&rfds); - FD_SET(0, &rfds); - FD_SET(_dpkgin, &rfds); - FD_SET(master, &rfds); while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { if(res < 0) { // FIXME: move this to a function or something, looks ugly here @@ -676,6 +671,10 @@ bool pkgDPkgPM::Go(int OutStatusFd) } // wait for input or output here + FD_ZERO(&rfds); + FD_SET(0, &rfds); + FD_SET(_dpkgin, &rfds); + FD_SET(master, &rfds); tv.tv_sec = 1; tv.tv_usec = 0; select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv); @@ -684,11 +683,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) else if (select_ret == 0) continue; - DoStdin(master); - DoTerminalPty(master, term_out); + if(FD_ISSET(master, &rfds)) + DoTerminalPty(master, term_out); + if(FD_ISSET(0, &rfds)) + DoStdin(master); // FIXME: move this into its own function too //DoDpkgStatusFd(); + if(FD_ISSET(_dpkgin, &rfds)) while(true) { if(read(_dpkgin, buf, 1) <= 0) -- cgit v1.2.3 From 6191b008773fc4f0476d4c8f485d146dab13cccd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Jul 2007 00:22:42 +0100 Subject: apt-pkg/deb/dpkgpm.{cc,h}: - move make dpkgstatus processing into DoDpkgStatusFd() and ProcessDpkgStatusLine() [the later is a stub for now] --- apt-pkg/deb/dpkgpm.cc | 62 +++++++++++++++++++++++++++++++++++++++++---------- apt-pkg/deb/dpkgpm.h | 8 ++++++- 2 files changed, 57 insertions(+), 13 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 46a2aaa6a..949ae1c3f 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -40,7 +40,7 @@ using namespace std; // DPkgPM::pkgDPkgPM - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache) +pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache), dpkgbuf_pos(0) { } /*}}}*/ @@ -358,7 +358,52 @@ void pkgDPkgPM::DoTerminalPty(int master, FILE *term_out) write(1, term_buf, len); } /*}}}*/ +// DPkgPM::ProcessDpkgStatusBuf /*{{{*/ +// --------------------------------------------------------------------- +/* + */ +void pkgDPkgPM::ProcessDpkgStatusLine(char *line) +{ + std::cerr << "got line: '" << line << "'" << std::endl; +} + +// DPkgPM::DoDpkgStatusFd /*{{{*/ +// --------------------------------------------------------------------- +/* + */ +void pkgDPkgPM::DoDpkgStatusFd(int statusfd) +{ + char *p, *q; + int len; + + len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos); + dpkgbuf_pos += len; + if(len <= 0) + return; + // process line by line if we have a buffer + p = q = dpkgbuf; + while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL) + { + *q = 0; + ProcessDpkgStatusLine(p); + p=q+1; // continue with next line + } + + // now move the unprocessed bits (after the final \n that is now a 0x0) + // to the start and update dpkgbuf_pos + p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos); + if(p == NULL) + return; + + // we are interessted in the first char *after* 0x0 + p++; + + // move the unprocessed tail to the start and update pos + memmove(dpkgbuf, p, p-dpkgbuf); + dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p; +} + /*}}}*/ // DPkgPM::Go - Run the sequence /*{{{*/ @@ -626,20 +671,15 @@ bool pkgDPkgPM::Go(int OutStatusFd) // we read from dpkg here int _dpkgin = fd[0]; - fcntl(_dpkgin, F_SETFL, O_NONBLOCK); close(fd[1]); // close the write end of the pipe // the read buffers for the communication with dpkg - char line[1024] = {0,}; char buf[2] = {0,0}; // the result of the waitpid call int res; close(slave); -#if 0 - fcntl(0, F_SETFL, O_NONBLOCK); - fcntl(master, F_SETFL, O_NONBLOCK); -#endif + // FIXME: make this a apt config option and add a logrotate file FILE *term_out = fopen("/var/log/dpkg-out.log","a"); chmod("/var/log/dpkg-out.log", 0600); @@ -688,12 +728,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) if(FD_ISSET(0, &rfds)) DoStdin(master); - // FIXME: move this into its own function too - // FIXME2: do not use non-blocking read here, - // read/process as much data as possible - // Yin one run - //DoDpkgStatusFd(); if(FD_ISSET(_dpkgin, &rfds)) + DoDpkgStatusFd(_dpkgin); +#if 0 while(true) { if(read(_dpkgin, buf, 1) <= 0) @@ -804,6 +841,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // reset the line buffer line[0]=0; } +#endif } close(_dpkgin); fclose(term_out); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index a1466878d..f47cd0bd8 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -18,6 +18,10 @@ using std::vector; class pkgDPkgPM : public pkgPackageManager { + private: + int dpkgbuf_pos; + char dpkgbuf[1024]; + protected: // used for progress reporting @@ -47,7 +51,9 @@ class pkgDPkgPM : public pkgPackageManager // input processing void DoStdin(int master); void DoTerminalPty(int master, FILE *out); - // void DoDpkgStatusFd(); + void DoDpkgStatusFd(int statusfd); + void ProcessDpkgStatusLine(char *line); + // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); -- cgit v1.2.3 From 09fa2df2f4717ac956210d43e3f3465d6ef5b82b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Jul 2007 00:56:22 +0100 Subject: apt-pkg/deb/dpkgpm.{cc,h}: - move output processing ProcessDpkgStatusLine() and out of the Go() method (yeah!) - things start to look more tidy now --- apt-pkg/deb/dpkgpm.cc | 224 +++++++++++++++++++++----------------------------- apt-pkg/deb/dpkgpm.h | 31 +++++-- 2 files changed, 117 insertions(+), 138 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 949ae1c3f..bef35ab4c 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -37,10 +37,13 @@ using namespace std; + + // DPkgPM::pkgDPkgPM - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache), dpkgbuf_pos(0) +pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) + : pkgPackageManager(Cache), dpkgbuf_pos(0), Total(0), Done(0) { } /*}}}*/ @@ -362,16 +365,100 @@ void pkgDPkgPM::DoTerminalPty(int master, FILE *term_out) // --------------------------------------------------------------------- /* */ -void pkgDPkgPM::ProcessDpkgStatusLine(char *line) +void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) { - std::cerr << "got line: '" << line << "'" << std::endl; + // the status we output + ostringstream status; + + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "got from dpkg '" << line << "'" << std::endl; + + + /* dpkg sends strings like this: + 'status: : ' + errors look like this: + 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data + and conffile-prompt like this + 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited + + */ + char* list[5]; + // dpkg sends multiline error messages sometimes (see + // #374195 for a example. we should support this by + // either patching dpkg to not send multiline over the + // statusfd or by rewriting the code here to deal with + // it. for now we just ignore it and not crash + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); + char *pkg = list[1]; + char *action = _strstrip(list[2]); + if( pkg == NULL || action == NULL) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring line: not enough ':'" << std::endl; + return; + } + + if(strncmp(action,"error",strlen("error")) == 0) + { + status << "pmerror:" << list[1] + << ":" << (Done/float(Total)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + if(strncmp(action,"conffile",strlen("conffile")) == 0) + { + status << "pmconffile:" << list[1] + << ":" << (Done/float(Total)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + + vector &states = PackageOps[pkg]; + const char *next_action = NULL; + if(PackageOpsDone[pkg] < states.size()) + next_action = states[PackageOpsDone[pkg]].state; + // check if the package moved to the next dpkg state + if(next_action && (strcmp(action, next_action) == 0)) + { + // only read the translation if there is actually a next + // action + const char *translation = _(states[PackageOpsDone[pkg]].str); + char s[200]; + snprintf(s, sizeof(s), translation, pkg); + + // we moved from one dpkg state to a new one, report that + PackageOpsDone[pkg]++; + Done++; + // build the status str + status << "pmstatus:" << pkg + << ":" << (Done/float(Total)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + } + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "(parsed from dpkg) pkg: " << pkg + << " action: " << action << endl; } // DPkgPM::DoDpkgStatusFd /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDPkgPM::DoDpkgStatusFd(int statusfd) +void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd) { char *p, *q; int len; @@ -386,7 +473,7 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd) while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL) { *q = 0; - ProcessDpkgStatusLine(p); + ProcessDpkgStatusLine(OutStatusFd, p); p=q+1; // continue with next line } @@ -426,9 +513,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) return false; - // prepare the progress reporting - int Done = 0; - int Total = 0; // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) static const struct DpkgState DpkgStatesOpMap[][5] = { @@ -460,15 +544,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) }, }; - // 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 > 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 PackageOpsDone; - // init the PackageOps map, go over the list of packages that // that will be [installed|configured|removed|purged] and add // them to the PackageOps map (the dpkg states it goes through) @@ -727,121 +802,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) DoTerminalPty(master, term_out); if(FD_ISSET(0, &rfds)) DoStdin(master); - if(FD_ISSET(_dpkgin, &rfds)) - DoDpkgStatusFd(_dpkgin); -#if 0 - while(true) - { - if(read(_dpkgin, buf, 1) <= 0) - break; - - // sanity check (should never happen) - if(strlen(line) >= sizeof(line)-10) - { - _error->Error("got a overlong line from dpkg: '%s'",line); - line[0]=0; - continue; - } - // append to line, check if we got a complete line - strcat(line, buf); - if(buf[0] != '\n') - continue; - - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "got from dpkg '" << line << "'" << std::endl; - - // the status we output - ostringstream status; - - /* dpkg sends strings like this: - 'status: : ' - errors look like this: - 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data - and conffile-prompt like this - 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited - - */ - char* list[5]; - // dpkg sends multiline error messages sometimes (see - // #374195 for a example. we should support this by - // either patching dpkg to not send multiline over the - // statusfd or by rewriting the code here to deal with - // it. for now we just ignore it and not crash - TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); - char *pkg = list[1]; - char *action = _strstrip(list[2]); - if( pkg == NULL || action == NULL) - { - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "ignoring line: not enough ':'" << std::endl; - // reset the line buffer - line[0]=0; - continue; - } - - if(strncmp(action,"error",strlen("error")) == 0) - { - status << "pmerror:" << list[1] - << ":" << (Done/float(Total)*100.0) - << ":" << list[3] - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - line[0]=0; - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - continue; - } - if(strncmp(action,"conffile",strlen("conffile")) == 0) - { - status << "pmconffile:" << list[1] - << ":" << (Done/float(Total)*100.0) - << ":" << list[3] - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - line[0]=0; - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - continue; - } - - vector &states = PackageOps[pkg]; - const char *next_action = NULL; - if(PackageOpsDone[pkg] < states.size()) - next_action = states[PackageOpsDone[pkg]].state; - // check if the package moved to the next dpkg state - if(next_action && (strcmp(action, next_action) == 0)) - { - // only read the translation if there is actually a next - // action - const char *translation = _(states[PackageOpsDone[pkg]].str); - char s[200]; - snprintf(s, sizeof(s), translation, pkg); - - // we moved from one dpkg state to a new one, report that - PackageOpsDone[pkg]++; - Done++; - // build the status str - status << "pmstatus:" << pkg - << ":" << (Done/float(Total)*100.0) - << ":" << s - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - - } - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "(parsed from dpkg) pkg: " << pkg - << " action: " << action << endl; - - // reset the line buffer - line[0]=0; - } -#endif + DoDpkgStatusFd(_dpkgin, OutStatusFd); } close(_dpkgin); fclose(term_out); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index f47cd0bd8..c7792aba4 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -12,25 +12,42 @@ #include #include +#include #include using std::vector; +using std::map; + class pkgDPkgPM : public pkgPackageManager { private: - int dpkgbuf_pos; - char dpkgbuf[1024]; - protected: + // the buffer we use for the dpkg status-fd reading + char dpkgbuf[1024]; + int dpkgbuf_pos; - // 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 }; - + + // 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 > 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 PackageOpsDone; + // progress reporting + int Done; + int Total; + + protected: + struct Item { enum Ops {Install, Configure, Remove, Purge} Op; @@ -51,8 +68,8 @@ class pkgDPkgPM : public pkgPackageManager // input processing void DoStdin(int master); void DoTerminalPty(int master, FILE *out); - void DoDpkgStatusFd(int statusfd); - void ProcessDpkgStatusLine(char *line); + void DoDpkgStatusFd(int statusfd, int OutStatusFd); + void ProcessDpkgStatusLine(int OutStatusFd, char *line); // The Actuall installation implementation -- cgit v1.2.3 From ff56e98015b17c73a3f1aacf3deef5ec4ef4e21b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Jul 2007 10:37:05 +0100 Subject: apt-pkg/deb/dpkgpm.{cc,h} - a bit cleanup - move the log date to the right place - write log to dir::log::name apt-pkg/init.cc: - init dir::log::name "/var/log/apt/term.log" debian/apt.dirs: - create /var/log/apt/ doc/examples/configure-index: - add new dir::log::name to the index --- apt-pkg/deb/dpkgpm.cc | 48 ++++++++++++++++++++++++++------------------ apt-pkg/deb/dpkgpm.h | 9 ++++----- apt-pkg/init.cc | 4 ++++ debian/apt.dirs | 1 + doc/examples/configure-index | 5 +++++ 5 files changed, 42 insertions(+), 25 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index bef35ab4c..8cb076edd 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -43,7 +43,7 @@ using namespace std; // --------------------------------------------------------------------- /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) - : pkgPackageManager(Cache), dpkgbuf_pos(0), Total(0), Done(0) + : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0), PackagesDone(0) { } /*}}}*/ @@ -401,7 +401,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) if(strncmp(action,"error",strlen("error")) == 0) { status << "pmerror:" << list[1] - << ":" << (Done/float(Total)*100.0) + << ":" << (PackagesDone/float(PackagesTotal)*100.0) << ":" << list[3] << endl; if(OutStatusFd > 0) @@ -413,7 +413,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) if(strncmp(action,"conffile",strlen("conffile")) == 0) { status << "pmconffile:" << list[1] - << ":" << (Done/float(Total)*100.0) + << ":" << (PackagesDone/float(PackagesTotal)*100.0) << ":" << list[3] << endl; if(OutStatusFd > 0) @@ -438,10 +438,10 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) // we moved from one dpkg state to a new one, report that PackageOpsDone[pkg]++; - Done++; + PackagesDone++; // build the status str status << "pmstatus:" << pkg - << ":" << (Done/float(Total)*100.0) + << ":" << (PackagesDone/float(PackagesTotal)*100.0) << ":" << s << endl; if(OutStatusFd > 0) @@ -555,10 +555,27 @@ bool pkgDPkgPM::Go(int OutStatusFd) for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) { PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]); - Total++; + PackagesTotal++; } } + // create log + string logdir = _config->FindDir("Dir::Log"); + if(not FileExists(logdir)) + return _error->Error(_("Directory '%s' missing"), logdir.c_str()); + string logfile_name = flCombine(logdir, + _config->Find("Dir::Log::Name")); + FILE *term_out = fopen(logfile_name.c_str(),"a"); + chmod(logfile_name.c_str(), 0600); + // output current time + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "Log started: "); + fprintf(term_out, outstr); + fprintf(term_out, "\n"); + // this loop is runs once per operation for (vector::iterator I = List.begin(); I != List.end();) { @@ -755,18 +772,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) int res; close(slave); - // FIXME: make this a apt config option and add a logrotate file - FILE *term_out = fopen("/var/log/dpkg-out.log","a"); - chmod("/var/log/dpkg-out.log", 0600); - // output current time - char outstr[200]; - time_t t = time(NULL); - struct tm *tmp = localtime(&t); - strftime(outstr, sizeof(outstr), "%F %T", tmp); - fprintf(term_out, "Log started: "); - fprintf(term_out, outstr); - fprintf(term_out, "\n"); - // setups fds fd_set rfds; struct timeval tv; @@ -806,7 +811,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) DoDpkgStatusFd(_dpkgin, OutStatusFd); } close(_dpkgin); - fclose(term_out); // Restore sig int/quit signal(SIGQUIT,old_SIGQUIT); @@ -832,10 +836,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) else _error->Error("Sub-process %s exited unexpectedly",Args[0]); - if(stopOnError) + if(stopOnError) + { + fclose(term_out); return false; + } } } + fclose(term_out); if (RunScripts("DPkg::Post-Invoke") == false) return false; diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index c7792aba4..c552b20c9 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -27,6 +27,8 @@ class pkgDPkgPM : public pkgPackageManager char dpkgbuf[1024]; int dpkgbuf_pos; + protected: + // progress reporting struct DpkgState { @@ -43,10 +45,8 @@ class pkgDPkgPM : public pkgPackageManager // going to be install is already in state "half-installed") map PackageOpsDone; // progress reporting - int Done; - int Total; - - protected: + int PackagesDone; + int PackagesTotal; struct Item { @@ -71,7 +71,6 @@ class pkgDPkgPM : public pkgPackageManager void DoDpkgStatusFd(int statusfd, int OutStatusFd); void ProcessDpkgStatusLine(int OutStatusFd, char *line); - // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 2f15486d9..2617603ec 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -74,6 +74,10 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); + + // State + Cnf.Set("Dir::Log","var/log/apt"); + Cnf.Set("Dir::Log::Name","term.log"); bool Res = true; diff --git a/debian/apt.dirs b/debian/apt.dirs index 1543e8bb1..26bb0683c 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -7,4 +7,5 @@ etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic +var/log/apt usr/share/bug/apt diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d0aad1e3d..0bf407a4d 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -227,6 +227,11 @@ Dir "/" apt-get "/usr/bin/apt-get"; apt-cache "/usr/bin/apt-cache"; }; + + // Location of the logfile + Log "var/log/apt" { + Name "term.log"; + }; }; // Things that effect the APT dselect method -- cgit v1.2.3 From b574dd1fac99ba71b1d0adf0aa164100fcf0cb91 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Jul 2007 10:46:47 +0100 Subject: add logrotate support --- debian/apt.dirs | 1 + debian/apt.logrotate | 8 ++++++++ debian/rules | 1 + 3 files changed, 10 insertions(+) create mode 100644 debian/apt.logrotate diff --git a/debian/apt.dirs b/debian/apt.dirs index 26bb0683c..8ce9b175a 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -4,6 +4,7 @@ usr/lib/dpkg/methods/apt etc/apt etc/apt/apt.conf.d etc/apt/sources.list.d +etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic diff --git a/debian/apt.logrotate b/debian/apt.logrotate new file mode 100644 index 000000000..3e924d383 --- /dev/null +++ b/debian/apt.logrotate @@ -0,0 +1,8 @@ +/var/log/apt/term.log { + rotate 6 + monthly + compress + missingok + notifempty +} + diff --git a/debian/rules b/debian/rules index 3ebecfba4..dfee44fde 100755 --- a/debian/rules +++ b/debian/rules @@ -209,6 +209,7 @@ apt: build debian/shlibs.local cp -r $(BLD)/locale debian/$@/usr/share/ cp debian/bugscript debian/$@/usr/share/bug/apt/script + cp debian/apt.logrotate debian/$@/etc/logrorate.d/apt cp share/debian-archive.gpg debian/$@/usr/share/$@ cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove -- cgit v1.2.3