summaryrefslogtreecommitdiff
path: root/apt-inst/contrib
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-08-27 13:58:14 +0200
committerJulian Andres Klode <jak@debian.org>2015-08-27 13:58:14 +0200
commitf19d6a77f60b876e5453614d24886aabdd242ef6 (patch)
tree4d9ed940810a874e5112f2d5b7d159bef2a0d9cc /apt-inst/contrib
parent848fd2a65fa2aef296d44c9a19b89ac272ca12fe (diff)
parent3564c2f4cfd9cbca6114da15c27f73efd08df78c (diff)
Merge branch 'feature/extractar-filefd' into debian/experimental
Diffstat (limited to 'apt-inst/contrib')
-rw-r--r--apt-inst/contrib/extracttar.cc67
1 files changed, 11 insertions, 56 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 2c86d0d01..c21a336f0 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -82,28 +82,9 @@ ExtractTar::~ExtractTar()
means we hit the end of the tar file but there was still gzip data. */
bool ExtractTar::Done(bool Force)
{
- InFd.Close();
- if (GZPid <= 0)
- return true;
-
- /* If there is a pending error then we are cleaning up gzip and are
- not interested in it's failures */
- if (_error->PendingError() == true)
- Force = true;
-
- // Make sure we clean it up!
- kill(GZPid,SIGINT);
- string confvar = string("dir::bin::") + DecompressProg;
- if (ExecWait(GZPid,_config->Find(confvar.c_str(),DecompressProg.c_str()).c_str(),
- Force) == false)
- {
- GZPid = -1;
- return Force;
- }
-
- GZPid = -1;
- return true;
+ return InFd.Close();
}
+
/*}}}*/
// ExtractTar::StartGzip - Startup gzip /*{{{*/
// ---------------------------------------------------------------------
@@ -118,43 +99,17 @@ bool ExtractTar::StartGzip()
return true;
}
- int Pipes[2];
- if (pipe(Pipes) != 0)
- return _error->Errno("pipe",_("Failed to create pipes"));
-
- // Fork off the process
- GZPid = ExecFork();
-
- // Spawn the subprocess
- if (GZPid == 0)
- {
- // Setup the FDs
- dup2(Pipes[1],STDOUT_FILENO);
- dup2(File.Fd(),STDIN_FILENO);
- int Fd = open("/dev/null",O_RDWR);
- if (Fd == -1)
- _exit(101);
- dup2(Fd,STDERR_FILENO);
- close(Fd);
- SetCloseExec(STDOUT_FILENO,false);
- SetCloseExec(STDIN_FILENO,false);
- SetCloseExec(STDERR_FILENO,false);
-
- const char *Args[3];
- string confvar = string("dir::bin::") + DecompressProg;
- string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str());
- Args[0] = argv0.c_str();
- Args[1] = "-d";
- Args[2] = 0;
- execvp(Args[0],(char **)Args);
- cerr << _("Failed to exec gzip ") << Args[0] << endl;
- _exit(100);
+ std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+ std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
+ for (; compressor != compressors.end(); compressor++) {
+ if (compressor->Name == DecompressProg) {
+ return InFd.OpenDescriptor(File.Fd(), FileFd::ReadOnly, *compressor, false);
+ }
}
- // Fix up our FDs
- InFd.OpenDescriptor(Pipes[0], FileFd::ReadOnly, FileFd::None, true);
- close(Pipes[1]);
- return true;
+ return _error->Error(_("Cannot find a configured compressor for '%s'"),
+ DecompressProg.c_str());
+
}
/*}}}*/
// ExtractTar::Go - Perform extraction /*{{{*/