summaryrefslogtreecommitdiff
path: root/lib/backupclient
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2006-01-28 13:12:58 +0000
committerChris Wilson <chris+github@qwirx.com>2006-01-28 13:12:58 +0000
commita2b798939612ef6b40f67e8da36e9a532c869b47 (patch)
treeabf37abe1859fd0f5ad6d06277e994541a74559d /lib/backupclient
parent9e025fd0ea42782e93363958804c6e2437b44a30 (diff)
* 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
Diffstat (limited to 'lib/backupclient')
-rw-r--r--lib/backupclient/BackupClientFileAttributes.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/backupclient/BackupClientFileAttributes.cpp b/lib/backupclient/BackupClientFileAttributes.cpp
index a31cd7b4..3e59a265 100644
--- a/lib/backupclient/BackupClientFileAttributes.cpp
+++ b/lib/backupclient/BackupClientFileAttributes.cpp
@@ -330,21 +330,25 @@ void BackupClientFileAttributes::ReadAttributes(const char *Filename, bool ZeroM
// __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