Changeset 3023 for box

Timestamp:

12/10/2011 00:08:01 (8 months ago)

Author:

chris

Message:

Fix excludions on VSS paths by converting back to original namespace before
checking for them. Also simplifies code.

File:

• box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp (modified) (7 diffs)

box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp

@@ -310 +310 @@
                                 // Stat file to get info
                                 filename = MakeFullPath(rLocalPath, en->d_name);
+                                std::string realFileName = ConvertVssPathToRealPath(filename,
+                                        rBackupLocation);
 
                                 #ifdef WIN32
@@ -332 +334 @@
 
                                 #else // !WIN32
-
                                 if(EMU_LSTAT(filename.c_str(), &file_st) != 0)
                                 {
@@ -409 +410 @@
 
                                         // Exclude it?
-                                        if(rParams.mrContext.ExcludeFile(filename))
+                                        if(rParams.mrContext.ExcludeFile(realFileName))
                                         {
-                                                rNotifier.NotifyFileExcluded(this,
-                                                        ConvertVssPathToRealPath(filename, rBackupLocation));
-
+                                                rNotifier.NotifyFileExcluded(this, realFileName);
                                                 // Next item!
                                                 continue;
@@ -426 +425 @@
 
                                         // Exclude it?
-                                        if(rParams.mrContext.ExcludeDir(filename))
+                                        if(rParams.mrContext.ExcludeDir(realFileName))
                                         {
-                                                rNotifier.NotifyDirExcluded(this,
-                                                        ConvertVssPathToRealPath(filename, rBackupLocation));
+                                                rNotifier.NotifyDirExcluded(this, realFileName);
 
                                                 // Next item!
@@ -442 +440 @@
                                         if (en->d_type & FILE_ATTRIBUTE_REPARSE_POINT)
                                         {
-                                                rNotifier.NotifyMountPointSkipped(this,
-                                                        ConvertVssPathToRealPath(filename, rBackupLocation));
+                                                rNotifier.NotifyMountPointSkipped(this, realFileName);
                                                 continue;
                                         }
@@ -451 +448 @@
                                         dirs.push_back(std::string(en->d_name));
                                 }
-                                else
+                                else // not a file or directory, what is it?
                                 {
                                         if (type == S_IFSOCK
@@ -462 +459 @@
                                                 // see Debian bug 479145, no objections
                                         }
-                                        else if(rParams.mrContext.ExcludeFile(filename))
+                                        else if(rParams.mrContext.ExcludeFile(realFileName))
                                         {
-                                                rNotifier.NotifyFileExcluded(this, 
-                                                        ConvertVssPathToRealPath(filename, rBackupLocation));
+                                                rNotifier.NotifyFileExcluded(this, realFileName);
                                         }
                                         else
                                         {
-                                                rNotifier.NotifyUnsupportedFileType(this, 
-                                                        ConvertVssPathToRealPath(filename, rBackupLocation));
+                                                rNotifier.NotifyUnsupportedFileType(this,
+                                                        realFileName);
                                                 SetErrorWhenReadingFilesystemObject(rParams,
-                                                        ConvertVssPathToRealPath(filename, rBackupLocation));
+                                                        realFileName);
                                         }