[Box Backup-dev] COMMIT r342 - in box/trunk: . bin/bbackupquery infrastructure lib/backupclient lib/win32

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-01-28 13:12:58 +0000 (Sat, 28 Jan 2006)
New Revision: 342

Modified:
   box/trunk/bin/bbackupquery/BackupQueries.cpp
   box/trunk/infrastructure/makeparcels.pl
   box/trunk/lib/backupclient/BackupClientFileAttributes.cpp
   box/trunk/lib/win32/emu.cpp
   box/trunk/parcels.txt
Log:
* infrastructure/makeparcels.pl
- Use the target platform's name, rather than the build platform, in the
  generated package file names (useful for cross-compiling)

* lib/win32/emu.cpp
- Don't log a warning when statting a file that doesn't exist, as 
  bbackupquery does this to verify that the target does not exist before 
  restoring

* lib/backupclient/BackupClientFileAttributes.cpp
- Fixed a missing endian conversion that was causing file timestamps to 
  appear to be invalid, generating warnings about every file on the server,
  on Win32

* parcels.txt
- Include a couple of DLL files in the package on MinGW, which are needed
  to run the compiled binaries

* bin/bbackupquery/BackupQueries.cpp
- Fixed usage text for the "get" command


Modified: box/trunk/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/trunk/bin/bbackupquery/BackupQueries.cpp	2006-01-28 00:13:44 UTC (rev 341)
+++ box/trunk/bin/bbackupquery/BackupQueries.cpp	2006-01-28 13:12:58 UTC (rev 342)
@@ -779,7 +779,9 @@
 	// Check args
 	if(args.size() < 1 || (opts['i'] && args.size() != 2) || args.size() > 2)
 	{
-		printf("Incorrect usage.\ngetobject <object-id> <local-filename>\n or get -i <object-id> <local-filename>\n");
+		printf("Incorrect usage.\n"
+			"get <remote-filename> [<local-filename>] or\n"
+			"get -i <object-id> <local-filename>\n");
 		return;
 	}
 

Modified: box/trunk/infrastructure/makeparcels.pl
===================================================================
--- box/trunk/infrastructure/makeparcels.pl	2006-01-28 00:13:44 UTC (rev 341)
+++ box/trunk/infrastructure/makeparcels.pl	2006-01-28 13:12:58 UTC (rev 342)
@@ -169,7 +169,7 @@
 
 sub parcel_root
 {
-	$product_name.'-'.$product_version.'-'.$_[0].'-'.$build_os.$os_suffix
+	$product_name.'-'.$product_version.'-'.$_[0].'-'.$target_os.$os_suffix
 }
 
 sub parcel_dir

Modified: box/trunk/lib/backupclient/BackupClientFileAttributes.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupClientFileAttributes.cpp	2006-01-28 00:13:44 UTC (rev 341)
+++ box/trunk/lib/backupclient/BackupClientFileAttributes.cpp	2006-01-28 13:12:58 UTC (rev 342)
@@ -330,21 +330,25 @@
 		// __time64_t winTime = BoxTimeToSeconds(
 		// pnewAttr->ModificationTime);
 
-		box_time_t bob = BoxTimeToSeconds(pattr->ModificationTime);
-		__time64_t winTime = bob;
+		u_int64_t  modTime = box_ntoh64(pattr->ModificationTime);
+		box_time_t modSecs = BoxTimeToSeconds(modTime);
+		__time64_t winTime = modSecs;
+
 		if (_gmtime64(&winTime) == 0 )
 		{
-			::syslog(LOG_ERR, "Corrupt value in store "
-				"Modification Time in file %s", Filename);
+			::syslog(LOG_ERR, "Invalid Modification Time "
+				"caught for file: %s", Filename);
 			pattr->ModificationTime = 0;
 		}
 
-		bob = BoxTimeToSeconds(pattr->AttrModificationTime);
-		winTime = bob;
+		modTime = box_ntoh64(pattr->AttrModificationTime);
+		modSecs = BoxTimeToSeconds(modTime);
+		winTime = modSecs;
+
 		if (_gmtime64(&winTime) == 0 )
 		{
-			::syslog(LOG_ERR, "Corrupt value in store "
-				"Attr Modification Time in file %s", Filename);
+			::syslog(LOG_ERR, "Invalid Attribute Modification "
+				"Time caught for file: %s", Filename);
 			pattr->AttrModificationTime = 0;
 		}
 #endif

Modified: box/trunk/lib/win32/emu.cpp
===================================================================
--- box/trunk/lib/win32/emu.cpp	2006-01-28 00:13:44 UTC (rev 341)
+++ box/trunk/lib/win32/emu.cpp	2006-01-28 13:12:58 UTC (rev 342)
@@ -500,8 +500,6 @@
 
 		if (err == ERROR_FILE_NOT_FOUND)
 		{
-			::syslog(LOG_WARNING, 
-				"Failed to open '%s': file not found", pName);
 			errno = ENOENT;
 		}
 		else

Modified: box/trunk/parcels.txt
===================================================================
--- box/trunk/parcels.txt	2006-01-28 00:13:44 UTC (rev 341)
+++ box/trunk/parcels.txt	2006-01-28 13:12:58 UTC (rev 342)
@@ -12,6 +12,11 @@
 	script bin/bbackupd/win32/ReadMe.txt 
 	script bin/bbackupd/win32/bbackupd.conf
 
+	ONLY:mingw32
+	script /bin/mgwz.dll
+	script /bin/mingwm10.dll
+	END-ONLY
+
 OMIT:mingw32
 OMIT:CYGWIN