Preserve modification timestamp when zipping files.

third_party/zlib/google/zip.cc

 // Copyright (c) 2012 The Chromium 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 "third_party/zlib/google/zip.h"
 
+#include <string>
+#include <vector>
+
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "net/base/file_stream.h"
 #include "third_party/zlib/google/zip_internal.h"
 #include "third_party/zlib/google/zip_reader.h"
 
 #if defined(USE_SYSTEM_MINIZIP)
 #include <minizip/unzip.h>
 #include <minizip/zip.h>
 #else
 #include "third_party/zlib/contrib/minizip/unzip.h"
 #include "third_party/zlib/contrib/minizip/zip.h"
 #endif
 
 namespace {
 
+/**
+ * Returns a zip_fileinfo struct with the time represented by |file_time|.
+ */

[satorux1, 2013/12/13 04:52:50]

Please use // for comments

[João Eiras, 2013/12/17 10:15:38]

Done.

+zip_fileinfo TimeToZipFileInfo(const base::Time& file_time) {
+  base::Time::Exploded file_time_parts;
+  file_time.LocalExplode(&file_time_parts);
+
+  zip_fileinfo zip_info = {};
+  if (file_time_parts.year >= 1980) {
+    // This if check works around the handling of the year value in
+    // contrib/minizip/zip.c in function zip64local_TmzDateToDosDate
+    // It assumes that dates below 1980 are in the double digit format.
+    // Hence the fail safe option is to leave the date unset. Some programs
+    // might show the unset date as 1980-0-0 which is invalid.
+    zip_info.tmz_date.tm_year = file_time_parts.year;
+    zip_info.tmz_date.tm_mon = file_time_parts.month - 1;
+    zip_info.tmz_date.tm_mday = file_time_parts.day_of_month;
+    zip_info.tmz_date.tm_hour = file_time_parts.hour;
+    zip_info.tmz_date.tm_min = file_time_parts.minute;
+    zip_info.tmz_date.tm_sec = file_time_parts.second;
+  }
+
+  return zip_info;
+}
+
+/**
+ * Returns a zip_fileinfo with the last modification date of |path| set.
+ */

[satorux1, 2013/12/13 04:52:50]

ditto

[João Eiras, 2013/12/17 10:15:38]

Done.

+zip_fileinfo GetFileInfoForZipping(const base::FilePath& path) {
+  base::Time file_time;
+  base::PlatformFileInfo file_info;
+  if (base::GetFileInfo(path, &file_info))
+    file_time = file_info.last_modified;
+  return TimeToZipFileInfo(file_time);
+}
+
 bool AddFileToZip(zipFile zip_file, const base::FilePath& src_dir) {
   net::FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
   if (stream.OpenSync(src_dir, flags) != 0) {
     DLOG(ERROR) << "Could not open stream for path "
                 << src_dir.value();
     return false;
   }
 
   int num_bytes;
@@ skipping 21 matching lines @@
 #if defined(OS_WIN)
   ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/");
 #endif
 
   bool is_directory = base::DirectoryExists(path);
   if (is_directory)
     str_path += "/";
 
   // Section 4.4.4 http://www.pkware.com/documents/casestudies/APPNOTE.TXT
   // Setting the Language encoding flag so the file is told to be in utf-8.
-  const unsigned long LANGUAGE_ENCODING_FLAG = 0x1 << 11;
+  const uLong LANGUAGE_ENCODING_FLAG = 0x1 << 11;
+
+  zip_fileinfo file_info = GetFileInfoForZipping(path);
 
   if (ZIP_OK != zipOpenNewFileInZip4(
-                    zip_file,  //file
+                    zip_file,  // file
                     str_path.c_str(),  // filename
-                    NULL,  // zipfi (file_info)
+                    &file_info,  // zipfi
                     NULL,  // extrafield_local,
                     0u,  // size_extrafield_local
                     NULL,  // extrafield_global
                     0u,  // size_extrafield_global
                     NULL,  // comment
                     Z_DEFLATED,  // method
                     Z_DEFAULT_COMPRESSION,  // level
                     0,  // raw
                     -MAX_WBITS,  // windowBits
                     DEF_MEM_LEVEL,  // memLevel
                     Z_DEFAULT_STRATEGY,  // strategy
-                    NULL,  //password
+                    NULL,  // password
                     0,  // crcForCrypting
                     0,  // versionMadeBy
                     LANGUAGE_ENCODING_FLAG)) {  // flagBase
     DLOG(ERROR) << "Could not open zip file entry " << str_path;
     return false;
   }
 
   bool success = true;
   if (!is_directory) {
     success = AddFileToZip(zip_file, path);
@@ skipping 122 matching lines @@
   if (ZIP_OK != zipClose(zip_file, NULL)) {
     DLOG(ERROR) << "Error closing zip file for fd " << dest_fd;
     success = false;
   }
 
   return success;
 }
 #endif  // defined(OS_POSIX)
 
 }  // namespace zip