Changeset 2633 for box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

Timestamp:

24/02/2010 19:23:14 (2 years ago)

Author:

chris

Message:

Add notification about uploading new file attributes.

Add check for changing file creation times on Windows, to cause the
attributes to be uploaded again.

File:

• box/trunk/lib/backupclient/BackupClientFileAttributes.cpp (modified) (5 diffs)

box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

@@ -79 +79 @@
 {
         int32_t uid, gid, mode;
+        #ifdef WIN32
+        int64_t fileCreationTime;
+        #endif
 } attributeHashData;
 
@@ -222 +225 @@
 // Function
 //              Name:    BackupClientFileAttributes::Compare(const BackupClientFileAttributes &, bool)
-//              Purpose: Compare, optionally ignoring the attribute modification time and/or modification time, and some data which is
-//                               irrelevant in practise (eg file generation number)
+//              Purpose: Compare, optionally ignoring the attribute
+//                       modification time and/or modification time, and some
+//                       data which is irrelevant in practise (eg file
+//                       generation number)
 //              Created: 10/12/03
 //
 // --------------------------------------------------------------------------
-bool BackupClientFileAttributes::Compare(const BackupClientFileAttributes &rAttr, bool IgnoreAttrModTime, bool IgnoreModTime) const
+bool BackupClientFileAttributes::Compare(const BackupClientFileAttributes &rAttr,
+        bool IgnoreAttrModTime, bool IgnoreModTime) const
 {
         EnsureClearAvailable();
@@ -1071 +1077 @@
 //
 // Function
-//              Name:    BackupClientFileAttributes::GenerateAttributeHash(struct stat &, const std::string &, const std::string &)
-//              Purpose: Generate a 64 bit hash from the attributes, used to detect changes.
-//                               Include filename in the hash, so that it changes from one file to another,
-//                               so don't reveal identical attributes.
+//              Name:    BackupClientFileAttributes::GenerateAttributeHash(
+//                       struct stat &, const std::string &,
+//                       const std::string &)
+//              Purpose: Generate a 64 bit hash from the attributes, used to
+//                       detect changes. Include filename in the hash, so
+//                       that it changes from one file to another, so don't
+//                       reveal identical attributes.
 //              Created: 25/4/04
 //
 // --------------------------------------------------------------------------
-uint64_t BackupClientFileAttributes::GenerateAttributeHash(EMU_STRUCT_STAT &st, const std::string &filename, const std::string &leafname)
+uint64_t BackupClientFileAttributes::GenerateAttributeHash(EMU_STRUCT_STAT &st,
+        const std::string &filename, const std::string &leafname)
 {
         if(sAttributeHashSecretLength == 0)
@@ -1093 +1103 @@
         hashData.mode = htonl(st.st_mode);
 
+        #ifdef WIN32
+        // On Windows, the "file attribute modification time" is the
+        // file creation time, and we want to back this up, restore
+        // it and compare it.
+        //
+        // On other platforms, it's not very important and can't
+        // reliably be set to anything other than the current time.
+        hashData.fileCreationTime = box_hton64(st.st_ctime);
+        #endif
+
         StreamableMemBlock xattr;
         FillExtendedAttr(xattr, filename.c_str());
@@ -1101 +1121 @@
         digest.Add(xattr.GetBuffer(), xattr.GetSize());
         digest.Add(leafname.c_str(), leafname.size());
-        digest.Add(sAttributeHashSecret, sAttributeHashSecretLength);
+        digest.Add(sAttributeHashSecret, sAttributeHashSecretLength);   
         digest.Finish();