AU: When applying delta locally, get source checksums

generate_delta_main.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ skipping 58 matching lines @@
                        logging::DONT_LOCK_LOG_FILE,
                        logging::APPEND_TO_OLD_LOG_FILE);
   if (!FLAGS_apply_delta.empty()) {
     if (FLAGS_old_image.empty()) {
       LOG(FATAL) << "Must pass --old_image with --apply_delta.";
     }
     Prefs prefs;
     LOG(INFO) << "Setting up preferences under: " << FLAGS_prefs_dir;
     LOG_IF(ERROR, !prefs.Init(FilePath(FLAGS_prefs_dir)))
         << "Failed to initialize preferences.";
+    // Get original checksums
+    LOG(INFO) << "Calculating original checksums";
+    PartitionInfo kern_info, root_info;
+    CHECK(InitializePartitionInfo(true,  // is_kernel
+                                  FLAGS_old_kernel,
+                                  &kern_info));
+    CHECK(InitializePartitionInfo(false,  // is_kernel
+                                  FLAGS_old_image,
+                                  &root_info));
+    vector<char> kern_hash(kern_info.hash().begin(),
+                           kern_info.hash().end());
+    vector<char> root_hash(root_info.hash().begin(),
+                            root_info.hash().end());

[petkov, 2010/10/22 20:15:16]

indent is off.

[adlr, 2010/10/22 20:40:18]

Done.

     DeltaPerformer performer(&prefs);
+    performer.set_current_kernel_hash(&kern_hash);
+    performer.set_current_rootfs_hash(&root_hash);
     CHECK_EQ(performer.Open(FLAGS_old_image.c_str(), 0, 0), 0);
     CHECK(performer.OpenKernel(FLAGS_old_kernel.c_str()));
     vector<char> buf(1024 * 1024);
     int fd = open(FLAGS_apply_delta.c_str(), O_RDONLY, 0);
     CHECK_GE(fd, 0);
     ScopedFdCloser fd_closer(&fd);
     for (off_t offset = 0;; offset += buf.size()) {
       ssize_t bytes_read;
       CHECK(utils::PReadAll(fd, &buf[0], buf.size(), offset, &bytes_read));
       if (bytes_read == 0)
@@ skipping 30 matching lines @@
   return 0;
 }
 
 }  // namespace {}
 
 }  // namespace chromeos_update_engine
 
 int main(int argc, char** argv) {
   return chromeos_update_engine::Main(argc, argv);
 }