Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't change file access time implicitly when setting it explicitly.

Browse Source 
wxFileHandle helper class used in wxFileName::SetTimes() under MSW modified
the file access time by setting it to the current time because it opened the
file in a wrong mode.

Closes #10567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-24 00:01:25 +00:00
parent a12bd55b0d
commit f3c74c8df9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/filename.cpp
View File

@@ -160,17 +160,21 @@ class wxFileHandle
public: public:
enum OpenMode enum OpenMode
{ {
Read, ReadAttr,
Write WriteAttr
}; };
wxFileHandle(const wxString& filename, OpenMode mode, int flags = 0) wxFileHandle(const wxString& filename, OpenMode mode, int flags = 0)
{ {
// be careful and use FILE_{READ,WRITE}_ATTRIBUTES here instead of the
// usual GENERIC_{READ,WRITE} as we don't want the file access time to
// be changed when we open it because this class is used for setting
// access time (see #10567)
m_hFile = ::CreateFile m_hFile = ::CreateFile
( (
filename.fn_str(), // name filename.fn_str(), // name
mode == Read ? GENERIC_READ // access mask mode == ReadAttr ? FILE_READ_ATTRIBUTES // access mask
: GENERIC_WRITE, : FILE_WRITE_ATTRIBUTES,
FILE_SHARE_READ | // sharing mode FILE_SHARE_READ | // sharing mode
FILE_SHARE_WRITE, // (allow everything) FILE_SHARE_WRITE, // (allow everything)
NULL, // no secutity attr NULL, // no secutity attr
@@ -181,7 +185,7 @@ public:
if ( m_hFile == INVALID_HANDLE_VALUE ) if ( m_hFile == INVALID_HANDLE_VALUE )
{ {
if ( mode == Read ) if ( mode == ReadAttr )
{ {
wxLogSysError(_("Failed to open '%s' for reading"), wxLogSysError(_("Failed to open '%s' for reading"),
filename.c_str()); filename.c_str());
@@ -2331,7 +2335,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtAccess,
flags = 0; flags = 0;
} }
wxFileHandle fh(path, wxFileHandle::Write, flags); wxFileHandle fh(path, wxFileHandle::WriteAttr, flags);
if ( fh.IsOk() ) if ( fh.IsOk() )
{ {
if ( ::SetFileTime(fh, if ( ::SetFileTime(fh,
@@ -2415,7 +2419,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess,
} }
else // file else // file
{ {
wxFileHandle fh(GetFullPath(), wxFileHandle::Read); wxFileHandle fh(GetFullPath(), wxFileHandle::ReadAttr);
if ( fh.IsOk() ) if ( fh.IsOk() )
{ {
ok = ::GetFileTime(fh, ok = ::GetFileTime(fh,
@@ -2485,7 +2489,7 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
// TODO // TODO
return wxInvalidSize; return wxInvalidSize;
#elif defined(__WIN32__) #elif defined(__WIN32__)
wxFileHandle f(filename, wxFileHandle::Read); wxFileHandle f(filename, wxFileHandle::ReadAttr);
if (!f.IsOk()) if (!f.IsOk())
return wxInvalidSize; return wxInvalidSize;