flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed #491

Browse Source
This commit is contained in:
Tiger Wang 2014-02-03 22:25:16 +00:00
parent 6de8c09fe0
commit fad90081d2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/OSSupport/File.cpp
View File

@ -73,14 +73,26 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
return false; return false;
} }
} }
m_File = fopen( (FILE_IO_PREFIX + iFileName).c_str(), Mode);
#ifdef _WIN32
fopen_s(&m_File, (FILE_IO_PREFIX + iFileName).c_str(), Mode);
#else
m_File = fopen((FILE_IO_PREFIX + iFileName).c_str(), Mode);
#endif // _WIN32
if ((m_File == NULL) && (iMode == fmReadWrite)) if ((m_File == NULL) && (iMode == fmReadWrite))
{ {
// Fix for MS not following C spec, opening "a" mode files for writing at the end only // Fix for MS not following C spec, opening "a" mode files for writing at the end only
// The file open operation has been tried with "read update", fails if file not found // The file open operation has been tried with "read update", fails if file not found
// So now we know either the file doesn't exist or we don't have rights, no need to worry about file contents. // So now we know either the file doesn't exist or we don't have rights, no need to worry about file contents.
// Simply re-open for read-writing, erasing existing contents: // Simply re-open for read-writing, erasing existing contents:
m_File = fopen( (FILE_IO_PREFIX + iFileName).c_str(), "wb+");
#ifdef _WIN32
fopen_s(&m_File, (FILE_IO_PREFIX + iFileName).c_str(), "wb+");
#else
m_File = fopen((FILE_IO_PREFIX + iFileName).c_str(), "wb+");
#endif // _WIN32
} }
return (m_File != NULL); return (m_File != NULL);
} }