[Box Backup-commit] COMMIT r3481 - box/trunk/bin/bbackupd

[subversion at boxbackup.org]

Author: chris
Date: 2014-12-24 13:02:36 +0000 (Wed, 24 Dec 2014)
New Revision: 3481

Modified:
   box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
Log:
Don't add files to lists until we're sure that we'll back them up.

Modified: box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2014-12-24 13:02:31 UTC (rev 3480)
+++ box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2014-12-24 13:02:36 UTC (rev 3481)
@@ -525,9 +525,6 @@
 			// Next item!
 			return false;
 		}
-
-		// Store on list
-		rFiles.push_back(entry_name);
 	}
 	else if(type == S_IFDIR)
 	{
@@ -553,9 +550,6 @@
 			return false;
 		}
 		#endif
-
-		// Store on list
-		rDirs.push_back(entry_name);
 	}
 	else // not a file or directory, what is it?
 	{
@@ -640,6 +634,16 @@
 		}
 	}
 
+	// We've decided to back it up, so add to file or directory list.
+	if(type == S_IFREG || type == S_IFLNK)
+	{
+		rFiles.push_back(entry_name);
+	}
+	else if(type == S_IFDIR)
+	{
+		rDirs.push_back(entry_name);
+	}
+
 	return true;
 }