[Box Backup-commit] COMMIT r1732 - in box/chris/general: bin/bbackupd/win32 lib/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-07-26 22:31:00 +0100 (Thu, 26 Jul 2007)
New Revision: 1732

Modified:
   box/chris/general/bin/bbackupd/win32/bbackupd.conf
   box/chris/general/lib/common/EventWatchFilesystemObject.cpp
Log:
Add missing #include <errno.h>, thanks Tobias. (refs #3, merges [1694])


Modified: box/chris/general/bin/bbackupd/win32/bbackupd.conf
===================================================================
--- box/chris/general/bin/bbackupd/win32/bbackupd.conf	2007-07-26 21:27:19 UTC (rev 1731)
+++ box/chris/general/bin/bbackupd/win32/bbackupd.conf	2007-07-26 21:31:00 UTC (rev 1732)
@@ -1,6 +1,5 @@
-
-StoreHostname = yourhost
-AccountNumber = 0x1
+StoreHostname = yourhost.domain.tld
+AccountNumber = 0x19871234
 KeysFile = C:\Program Files\Box Backup\1-FileEncKeys.raw
 
 CertificateFile = C:\Program Files\Box Backup\1-cert.pem
@@ -12,14 +11,13 @@
 # If you do not install it in the default location - also do not forget to 
 # change the pid file location (below)
 
-
 # This script is run whenever bbackupd encounters a problem which requires
 # the system administrator to assist:
 # 1) The store is full, and no more data can be uploaded.
 # 2) Some files or directories were not readable.
 # The default script emails the system administrator.
 
-# NotifyScript = NotifySysadmin.sh
+# NotifyScript = NotifySysadmin.bat
 
 
 # A scan of the local discs will be made once an hour (approximately).
@@ -78,7 +76,7 @@
 # be asked again in that number of seconds.
 # For example, you could use this on a laptop to only backup when on a specific network.
 
-# SyncAllowScript = /path/to/intepreter/or/exe script-name parameters etc
+# SyncAllowScript = C:\Program Files\Box Backup\SyncAllowScript.bat parameters etc
 
 
 # Where the command socket is created in the filesystem.
@@ -100,12 +98,13 @@
 # 
 # 	name
 # 	{
-# 		Path = /path/of/directory
+# 		Path = D:\path\of\directory
 # 		(optional exclude directives)
 # 	}
 # 
 # 'name' is derived from the Path by the config script, but should merely be
-# unique.
+# unique.  Keep it simple.  No spaces.  Not case sensitive(?).
+# Try to use only alphanumeric characters and underlines and dashes.
 # 
 # The exclude directives are of the form
 # 
@@ -115,29 +114,59 @@
 #
 # For example:
 # 
-# 	ExcludeDir = /home/guest-user
+# 	ExcludeDir = C:\Documents and Settings\Owner 
 # 	ExcludeFilesRegex = *.(mp3|MP3)$
-# 	AlwaysIncludeFile = /home/username/veryimportant.mp3
+# 	AlwaysIncludeFile = C:\Documents and Settings\Owner\My Documents\My Music\veryimportant.mp3
+#	AlwaysIncludeFilesRegex = .*backup.*\.pst$
+# 	ExcludeFilesRegex = .+\.avi$
+#	ExcludeDirsRegex = .+\\Temporary Internet Files$
 # 
-# This excludes the directory /home/guest-user from the backup along with all mp3
-# files, except one MP3 file in particular.
+# This excludes the directory C:\Documents and Settings\Owner from the backup along with all mp3
+# files, except one MP3 file in particular, along with a couple of other examples.
 # 
 # In general, Exclude excludes a file or directory, unless the directory is
 # explicitly mentioned in a AlwaysInclude directive.
 # 
 # If a directive ends in Regex, then it is a regular expression rather than a
-# explicit full pathname. See
+# explicit full pathname. See 
 # 
-# 	man 7 re_format
+# 	http://bbdev.fluffy.co.uk/trac/wiki/Win32Regex
 # 
-# for the regex syntax on your platform.
+# for the regex syntax on Windows.
 # 
 
 BackupLocations
 {
-      MyDocuments
+    MyDocuments
 	{
-                Path = C:\Documents and Settings\
+		Path = C:\Documents and Settings\
+			ExcludeDir = C:\Documents and Settings\Owner 
+			ExcludeFilesRegex = *.(mp3|MP3)$
+			ExcludeFilesRegex = .+\.([aA][vV][iI]|[iI][sS][oO]|[mM][pP][eE]?[345gG]|[bB][kK][~!1-9]|[mMtT][bB][kK])$
+			AlwaysIncludeFile = C:\Documents and Settings\Owner\My Documents\My Music\veryimportant.mp3
+			ExcludeFilesRegex = .+\.pst$
+			AlwaysIncludeFilesRegex = .*backup.*\.pst$
+			ExcludeFilesRegex = .+\.avi$
+			ExcludeDirsRegex = .+\\Temporary Internet Files$
+			ExcludeFilesRegex = .+\\pagefile\.sys$
+			ExcludeDirsRegex = .+\\pagefile\.sys$
+			ExcludeFilesRegex = .+\\boot\.ini$
+			ExcludeFilesRegex = .+\\NTDETECT\.COM$
+			ExcludeFilesRegex = .+\\UsrClass\.dat\.LOG$
+			ExcludeDirsRegex = .+\\System Volume Information$
+			ExcludeFilesRegex = .+\\ntldr$
+			ExcludeDirsRegex = .+\\Local Settings\\.*\\Cache$
+			ExcludeFilesRegex = .+\\thumbs\.db$
+			ExcludeFilesRegex = .+\\~.*
+			ExcludeFilesRegex = .+\\Perflib.*
+			ExcludeDirsRegex = .+\\Application Data$
+			ExcludeFilesRegex = .+\.bk[~!0-9]$
+			ExcludeFilesRegex = .+\.iso$
+			ExcludeFilesRegex = .+\.mpe?[2345g]$
+			ExcludeFilesRegex = .+\.qbw$
+			AlwaysIncludeFilesRegex = .+\.qbb$
+			ExcludeFilesRegex = .+\.tif[f]$
+			ExcludeFilesRegex = .+\.wmv$
 	}
 }
 

Modified: box/chris/general/lib/common/EventWatchFilesystemObject.cpp
===================================================================
--- box/chris/general/lib/common/EventWatchFilesystemObject.cpp	2007-07-26 21:27:19 UTC (rev 1731)
+++ box/chris/general/lib/common/EventWatchFilesystemObject.cpp	2007-07-26 21:31:00 UTC (rev 1732)
@@ -9,6 +9,7 @@
 
 #include "Box.h"
 
+#include <errno.h>
 #include <fcntl.h>
 
 #ifdef HAVE_UNISTD_H