diff options
author | Chris Wilson <chris+github@qwirx.com> | 2014-12-24 13:02:21 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2014-12-24 13:02:21 +0000 |
commit | 73e7ecdaa501871da4c820d0578bc88aaf03b060 (patch) | |
tree | b6d1395d33f5479233982b1bbe6e54c79f13858b /bin/bbackupd/BackupClientDirectoryRecord.cpp | |
parent | 6622bfe4eb59a2f38f7012349525ec64f0368118 (diff) |
Fix compile error on Windows caused by refactoring out SyncDirectoryEntry.
Thanks to Kai Liebenau for spotting it and submitting patches. I don't see
any need to actually collect link_st (using lstat) any more, because if the
location root is a symlink then we should just backup everything inside its
destination without question, and if it's not, comparing stat(parent) and
stat(child) will detect the difference, so no need to use lstat(parent)
instead.
Diffstat (limited to 'bin/bbackupd/BackupClientDirectoryRecord.cpp')
-rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index 6c12964a..691fd1c0 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -238,21 +238,6 @@ void BackupClientDirectoryRecord::SyncDirectory( std::vector<std::string> files; bool downloadDirectoryRecordBecauseOfFutureFiles = false; - EMU_STRUCT_STAT link_st; - if(EMU_LSTAT(rLocalPath.c_str(), &link_st) != 0) - { - // Report the error (logs and eventual email to administrator) - rNotifier.NotifyFileStatFailed(this, - ConvertVssPathToRealPath(rLocalPath, rBackupLocation), - strerror(errno)); - - // TODO FIXME move to NotifyFileStatFailed() - SetErrorWhenReadingFilesystemObject(rParams, rLocalPath); - - // This shouldn't happen, so we'd better not continue - THROW_EXCEPTION(CommonException, OSFileError) - } - // BLOCK { // read the contents... @@ -612,7 +597,7 @@ bool BackupClientDirectoryRecord::SyncDirectoryEntry( return false; } - if(file_st.st_dev != link_st.st_dev) + if(file_st.st_dev != dir_st.st_dev) { rNotifier.NotifyMountPointSkipped(this, ConvertVssPathToRealPath(filename, rBackupLocation)); |