diff options
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/copy.cc | 4 | ||||
| -rw-r--r-- | methods/gzip.cc | 54 |
2 files changed, 35 insertions, 23 deletions
diff --git a/methods/copy.cc b/methods/copy.cc index 0c9f322e6..373ad3604 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -38,7 +38,7 @@ class CopyMethod : public pkgAcqMethod void CopyMethod::CalculateHashes(FetchItem const * const Itm, FetchResult &Res) { Hashes Hash(Itm->ExpectedHashes); - FileFd Fd(Res.Filename, FileFd::ReadOnly, FileFd::Extension); + FileFd Fd(Res.Filename, FileFd::ReadOnly); Hash.AddFD(Fd); Res.TakeHashes(Hash); } @@ -65,7 +65,7 @@ bool CopyMethod::Fetch(FetchItem *Itm) URIStart(Res); // just calc the hashes if the source and destination are identical - if (File == Itm->DestFile) + if (File == Itm->DestFile || Itm->DestFile == "/dev/null") { CalculateHashes(Itm, Res); URIDone(Res); diff --git a/methods/gzip.cc b/methods/gzip.cc index 637aae124..2429069e5 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -71,28 +71,36 @@ bool GzipMethod::Fetch(FetchItem *Itm) return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog); // Open the source and destination files - FileFd From, To; + FileFd From; 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); + if (From.IsOpen() == false || From.Failed() == true) + return false; + + FileFd To; + if (Itm->DestFile != "/dev/null") + { + if (_config->FindB("Method::Compress", false) == false) + To.Open(Itm->DestFile, FileFd::WriteAtomic); + else + To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor); + + if (To.IsOpen() == false || To.Failed() == true) + return false; + To.EraseOnFailure(); } - To.EraseOnFailure(); - if (From.IsOpen() == false || From.Failed() == true || - To.IsOpen() == false || To.Failed() == true) - return false; // Read data from source, generate checksums and write Hashes Hash(Itm->ExpectedHashes); bool Failed = false; + Res.Size = 0; while (1) { unsigned char Buffer[4*1024]; @@ -100,14 +108,16 @@ bool GzipMethod::Fetch(FetchItem *Itm) if (!From.Read(Buffer,sizeof(Buffer),&Count)) { - To.OpFail(); + if (To.IsOpen()) + To.OpFail(); return false; } if (Count == 0) break; + Res.Size += Count; Hash.Add(Buffer,Count); - if (To.Write(Buffer,Count) == false) + if (To.IsOpen() && To.Write(Buffer,Count) == false) { Failed = true; break; @@ -115,23 +125,25 @@ bool GzipMethod::Fetch(FetchItem *Itm) } From.Close(); - Res.Size = To.FileSize(); To.Close(); if (Failed == true) return false; // Transfer the modification times - struct stat Buf; - if (stat(Path.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat")); - - 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")); + if (Itm->DestFile != "/dev/null") + { + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + 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.TakeHashes(Hash); |