Merged martin/xattr at r5 to trunk

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/backupclient/BackupClientFileAttributes.h b/lib/backupclient/BackupClientFileAttributes.h
index dd930684..17124039 100755
--- a/lib/backupclient/BackupClientFileAttributes.h
+++ b/lib/backupclient/BackupClientFileAttributes.h
@@ -52,10 +52,13 @@ public:
 	static void SetBlowfishKey(const void *pKey, int KeyLength);
 	static void SetAttributeHashSecret(const void *pSecret, int SecretLength);
 	
-	static uint64_t GenerateAttributeHash(struct stat &st, const std::string &rFilename);
+	static uint64_t GenerateAttributeHash(struct stat &st, const std::string &filename, const std::string &leafname);
+	static void FillExtendedAttr(StreamableMemBlock &outputBlock, const char *Filename);
 
 private:
-	void ReadAttributesLink(const char *Filename, void *pst, bool ZeroModificationTimes);
+	static void FillAttributes(StreamableMemBlock &outputBlock, const char *Filename, struct stat &st, bool ZeroModificationTimes);
+	static void FillAttributesLink(StreamableMemBlock &outputBlock, const char *Filename, struct stat &st);
+	void WriteExtendedAttr(const char *Filename, int xattrOffset) const;
 
 	void RemoveClear() const;
 	void EnsureClearAvailable() const;