// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: gzip.cc,v 1.7 1999/01/27 02:48:53 jgg Exp $
+// $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $
/* ######################################################################
GZip method - Take a file URI in and decompress it into the target
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>
+#include <config.h>
+
+#include <apt-pkg/configuration.h>
#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <string.h>
#include <sys/stat.h>
-#include <unistd.h>
-#include <utime.h>
-#include <wait.h>
-#include <stdio.h>
+#include <sys/time.h>
+#include <string>
+#include <vector>
+
+#include <apti18n.h>
/*}}}*/
+const char *Prog;
+
class GzipMethod : public pkgAcqMethod
{
virtual bool Fetch(FetchItem *Itm);
public:
- GzipMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
+ GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
};
+
// GzipMethod::Fetch - Decompress the passed URI /*{{{*/
// ---------------------------------------------------------------------
/* */
bool GzipMethod::Fetch(FetchItem *Itm)
{
URI Get = Itm->Uri;
-
+ std::string Path = Get.Host + Get.Path; // To account for relative paths
+
FetchResult Res;
Res.Filename = Itm->DestFile;
URIStart(Res);
-
- // Open the source and destintation files
- FileFd From(Get.Path,FileFd::ReadOnly);
- FileFd To(Itm->DestFile,FileFd::WriteEmpty);
+
+ 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 == Prog)
+ break;
+ if (compressor == compressors.end())
+ return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog);
+
+ // Open the source and destination files
+ FileFd From, To;
+ if (_config->FindB("Method::Compress", false) == false)
+ {
+ From.Open(Path, FileFd::ReadOnly, *compressor);
+ if(From.FileSize() == 0)
+ return _error->Error(_("Empty files can't be valid archives"));
+ To.Open(Itm->DestFile, FileFd::WriteAtomic);
+ }
+ else
+ {
+ From.Open(Path, FileFd::ReadOnly);
+ To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor);
+ }
To.EraseOnFailure();
- if (_error->PendingError() == true)
+
+ if (From.IsOpen() == false || From.Failed() == true ||
+ To.IsOpen() == false || To.Failed() == true)
return false;
-
- // Fork gzip
- int Process = fork();
- if (Process < 0)
- return _error->Errno("fork","Couldn't fork gzip");
-
- // The child
- if (Process == 0)
+
+ // Read data from source, generate checksums and write
+ Hashes Hash;
+ bool Failed = false;
+ while (1)
{
- dup2(From.Fd(),STDIN_FILENO);
- dup2(To.Fd(),STDOUT_FILENO);
- From.Close();
- To.Close();
- SetCloseExec(STDIN_FILENO,false);
- SetCloseExec(STDOUT_FILENO,false);
+ unsigned char Buffer[4*1024];
+ unsigned long long Count = 0;
- const char *Args[3];
- Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
- Args[1] = "-d";
- Args[2] = 0;
- execvp(Args[0],(char **)Args);
- exit(100);
+ if (!From.Read(Buffer,sizeof(Buffer),&Count))
+ {
+ To.OpFail();
+ return false;
+ }
+ if (Count == 0)
+ break;
+
+ Hash.Add(Buffer,Count);
+ if (To.Write(Buffer,Count) == false)
+ {
+ Failed = true;
+ break;
+ }
}
- From.Close();
-
- // Wait for gzip to finish
- int Status;
- if (waitpid(Process,&Status,0) != Process)
- {
- To.OpFail();
- return _error->Errno("wait","Waiting for gzip failed");
- }
-
- if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
- {
- To.OpFail();
- return _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong.");
- }
+ From.Close();
+ Res.Size = To.FileSize();
To.Close();
-
+
+ if (Failed == true)
+ return false;
+
// Transfer the modification times
struct stat Buf;
- if (stat(Get.Path.c_str(),&Buf) != 0)
- return _error->Errno("stat","Failed to stat");
+ if (stat(Path.c_str(),&Buf) != 0)
+ return _error->Errno("stat",_("Failed to stat"));
- struct utimbuf TimeBuf;
- TimeBuf.actime = Buf.st_atime;
- TimeBuf.modtime = Buf.st_mtime;
- if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
- return _error->Errno("utime","Failed to set modification time");
+ struct timeval times[2];
+ times[0].tv_sec = Buf.st_atime;
+ Res.LastModified = times[1].tv_sec = Buf.st_mtime;
+ times[0].tv_usec = times[1].tv_usec = 0;
+ if (utimes(Itm->DestFile.c_str(), times) != 0)
+ return _error->Errno("utimes",_("Failed to set modification time"));
// Return a Done response
- Res.LastModified = Buf.st_mtime;
+ Res.TakeHashes(Hash);
+
URIDone(Res);
-
return true;
}
/*}}}*/
-int main()
+int main(int, char *argv[])
{
+ setlocale(LC_ALL, "");
+
+ Prog = strrchr(argv[0],'/');
+ ++Prog;
+
GzipMethod Mth;
return Mth.Run();
}
projects / apt.git / blobdiff