Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WebDAV preserve time #454

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Fix WebDAV preserve time #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05d0ffb
Fix DateTimeToString
ssvine Apr 9, 2024
8983b47
Ensure correct locale is used in DateTimeToString
ssvine Apr 9, 2024
7c81d24
Fix WebDAV preserve time
ssvine Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/base/Sysutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,15 @@ bool TryStrToDateTime(const UnicodeString & StrValue, TDateTime & Value,
UnicodeString DateTimeToString(const UnicodeString & Format,
const TDateTime & DateTime)
{
auto LocaleDeleter = [](_locale_t *Locale)
{
if (Locale && *Locale)
{
_free_locale(*Locale);
}
};
static std::unique_ptr<_locale_t, decltype(LocaleDeleter)> CLocale(new _locale_t(_create_locale(LC_TIME, "C")), LocaleDeleter);

UnicodeString Result;
// SYSTEMTIME st;
// ::ZeroMemory(&st, sizeof(SYSTEMTIME));
Expand All @@ -1402,7 +1411,7 @@ UnicodeString DateTimeToString(const UnicodeString & Format,
return Result;

AnsiString Buffer(80, 0);
if (0 != strftime(const_cast<char *>(Buffer.data()), sizeof(Buffer), AnsiString(Format).c_str(), &dt))
if (0 != _strftime_l(const_cast<char *>(Buffer.data()), Buffer.GetLength(), AnsiString(Format).c_str(), &dt, *CLocale))
Result = Buffer;

return Result;
Expand Down
6 changes: 1 addition & 5 deletions src/core/WebDAVFileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,11 +1428,7 @@ void TWebDAVFileSystem::Source(
UnicodeString LastModified =
FormatDateTime(L"ddd, d mmm yyyy hh:nn:ss 'GMT'", ModificationUTC, FormatSettings);
#endif // defined(__BORLANDC__)
uint16_t Y, M, D, H, NN, S, MS;
const TDateTime & DateTime = ModificationUTC;
DateTime.DecodeDate(Y, M, D);
DateTime.DecodeTime(H, NN, S, MS);
const UnicodeString LastModified = FORMAT("%04d, %d %02d %04d %02d:%02d%02d 'GMT'", D, D, M, Y, H, NN, D);
const UnicodeString LastModified = DateTimeToString(L"%a, %#d %b %Y %H:%M:%S GMT", ModificationUTC);

const UTF8String NeonLastModified(LastModified);
// second element is "NULL-terminating"
Expand Down