X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/74dedb4ae28fd4f7c89bf769708d4f7edc7ed79a..HEAD:/methods/rred.cc diff --git a/methods/rred.cc b/methods/rred.cc index 89d706984..958933a07 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -336,26 +335,30 @@ class Patch { FileChanges filechanges; MemBlock add_text; - static bool retry_fwrite(char *b, size_t l, FileFd &f, Hashes *hash) + static bool retry_fwrite(char *b, size_t l, FileFd &f, Hashes * const start_hash, Hashes * const end_hash = nullptr) APT_NONNULL(1) { if (f.Write(b, l) == false) return false; - if (hash) - hash->Add((unsigned char*)b, l); + if (start_hash) + start_hash->Add((unsigned char*)b, l); + if (end_hash) + end_hash->Add((unsigned char*)b, l); return true; } - static void dump_rest(FileFd &o, FileFd &i, Hashes *hash) + static void dump_rest(FileFd &o, FileFd &i, + Hashes * const start_hash, Hashes * const end_hash) { char buffer[BLOCK_SIZE]; unsigned long long l = 0; while (i.Read(buffer, sizeof(buffer), &l)) { - if (l ==0 || !retry_fwrite(buffer, l, o, hash)) + if (l ==0 || !retry_fwrite(buffer, l, o, start_hash, end_hash)) break; } } - static void dump_lines(FileFd &o, FileFd &i, size_t n, Hashes *hash) + static void dump_lines(FileFd &o, FileFd &i, size_t n, + Hashes * const start_hash, Hashes * const end_hash) { char buffer[BLOCK_SIZE]; while (n > 0) { @@ -364,11 +367,11 @@ class Patch { size_t const l = strlen(buffer); if (l == 0 || buffer[l-1] == '\n') n--; - retry_fwrite(buffer, l, o, hash); + retry_fwrite(buffer, l, o, start_hash, end_hash); } } - static void skip_lines(FileFd &i, int n) + static void skip_lines(FileFd &i, int n, Hashes * const start_hash) { char buffer[BLOCK_SIZE]; while (n > 0) { @@ -377,11 +380,13 @@ class Patch { size_t const l = strlen(buffer); if (l == 0 || buffer[l-1] == '\n') n--; + if (start_hash) + start_hash->Add((unsigned char*)buffer, l); } } - static void dump_mem(FileFd &o, char *p, size_t s, Hashes *hash) { - retry_fwrite(p, s, o, hash); + static void dump_mem(FileFd &o, char *p, size_t s, Hashes *hash) APT_NONNULL(2) { + retry_fwrite(p, s, o, nullptr, hash); } public: @@ -491,7 +496,11 @@ class Patch { for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) { std::list::reverse_iterator mg_i, mg_e = ch; while (ch->del_cnt == 0 && ch->offset == 0) + { ++ch; + if (unlikely(ch == filechanges.rend())) + return; + } line -= ch->del_cnt; std::string buf; if (ch->add_cnt > 0) { @@ -522,15 +531,18 @@ class Patch { } } - void apply_against_file(FileFd &out, FileFd &in, Hashes *hash = NULL) + void apply_against_file(FileFd &out, FileFd &in, + Hashes * const start_hash = nullptr, Hashes * const end_hash = nullptr) { std::list::iterator ch; for (ch = filechanges.begin(); ch != filechanges.end(); ++ch) { - dump_lines(out, in, ch->offset, hash); - skip_lines(in, ch->del_cnt); - dump_mem(out, ch->add, ch->add_len, hash); + dump_lines(out, in, ch->offset, start_hash, end_hash); + skip_lines(in, ch->del_cnt, start_hash); + if (ch->add_len != 0) + dump_mem(out, ch->add, ch->add_len, end_hash); } - dump_rest(out, in, hash); + dump_rest(out, in, start_hash, end_hash); + out.Flush(); } }; @@ -561,7 +573,7 @@ class RredMethod : public aptMethod { protected: virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE { - Debug = _config->FindB("Debug::pkgAcquire::RRed", false); + Debug = DebugEnabled(); URI Get = Itm->Uri; std::string Path = Get.Host + Get.Path; // rred:/path - no host @@ -577,6 +589,16 @@ class RredMethod : public aptMethod { std::vector patchfiles; Patch patch; + HashStringList StartHashes; + for (char const * const * type = HashString::SupportedHashes(); *type != nullptr; ++type) + { + std::string tagname; + strprintf(tagname, "Start-%s-Hash", *type); + std::string const hashsum = LookupTag(Message, tagname.c_str()); + if (hashsum.empty() == false) + StartHashes.push_back(HashString(*type, hashsum)); + } + if (FileExists(Path + ".ed") == true) { HashStringList const ExpectedHashes = ReadExpectedHashesForPatch(0, Message); @@ -643,18 +665,31 @@ class RredMethod : public aptMethod { std::cerr << "FAILED to open inp " << Path << std::endl; return _error->Error("Failed to open inp %s", Path.c_str()); } - if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create, FileFd::Extension) == false) + if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty | FileFd::BufferedWrite, FileFd::Extension) == false) { std::cerr << "FAILED to open out " << Itm->DestFile << std::endl; return _error->Error("Failed to open out %s", Itm->DestFile.c_str()); } - Hashes hash(Itm->ExpectedHashes); - patch.apply_against_file(out, inp, &hash); + Hashes end_hash(Itm->ExpectedHashes); + if (StartHashes.usable()) + { + Hashes start_hash(StartHashes); + patch.apply_against_file(out, inp, &start_hash, &end_hash); + if (start_hash.GetHashStringList() != StartHashes) + _error->Error("The input file hadn't the expected hash!"); + } + else + patch.apply_against_file(out, inp, nullptr, &end_hash); out.Close(); inp.Close(); + if (_error->PendingError() == true) { + std::cerr << "FAILED to read or write files" << std::endl; + return false; + } + if (Debug == true) { std::clog << "rred: finished file patching of " << Path << "." << std::endl; } @@ -662,7 +697,7 @@ class RredMethod : public aptMethod { struct stat bufbase, bufpatch; if (stat(Path.c_str(), &bufbase) != 0 || stat(patch_name.c_str(), &bufpatch) != 0) - return _error->Errno("stat", _("Failed to stat")); + return _error->Errno("stat", _("Failed to stat %s"), Path.c_str()); struct timeval times[2]; times[0].tv_sec = bufbase.st_atime; @@ -672,18 +707,18 @@ class RredMethod : public aptMethod { return _error->Errno("utimes",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(), &bufbase) != 0) - return _error->Errno("stat", _("Failed to stat")); + return _error->Errno("stat", _("Failed to stat %s"), Itm->DestFile.c_str()); Res.LastModified = bufbase.st_mtime; Res.Size = bufbase.st_size; - Res.TakeHashes(hash); + Res.TakeHashes(end_hash); URIDone(Res); return true; } public: - RredMethod() : aptMethod("rred", "2.0",SingleInstance | SendConfig), Debug(false) {} + RredMethod() : aptMethod("rred", "2.0", SendConfig), Debug(false) {} }; int main(int argc, char **argv) @@ -693,15 +728,14 @@ int main(int argc, char **argv) bool test = false; Patch patch; - pkgInitConfig(*_config); - if (argc <= 1) { - RredMethod Mth; - return Mth.Run(); + return RredMethod().Run(); } // Usage: rred -t input output diff ... if (argc > 1 && strcmp(argv[1], "-t") == 0) { + // Read config files so we see compressors. + pkgInitConfig(*_config); just_diff = false; test = true; i = 4; @@ -729,17 +763,20 @@ int main(int argc, char **argv) FileFd out, inp; std::cerr << "Patching " << argv[2] << " into " << argv[3] << "\n"; inp.Open(argv[2], FileFd::ReadOnly,FileFd::Extension); - out.Open(argv[3], FileFd::WriteOnly | FileFd::Create, FileFd::Extension); + out.Open(argv[3], FileFd::WriteOnly | FileFd::Create | FileFd::Empty | FileFd::BufferedWrite, FileFd::Extension); patch.apply_against_file(out, inp); + out.Close(); } else if (just_diff) { FileFd out; out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create); patch.write_diff(out); + out.Close(); } else { FileFd out, inp; - out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create); + out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create | FileFd::BufferedWrite); inp.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly); patch.apply_against_file(out, inp); + out.Close(); } return 0; }