tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 15:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix NUL file-corruption bug after Windows shutdown brutally

Browse Source 
Bypass Windows caching when flushing files after write.

According Microsoft documentation this fixes the issues with saved file corruption (all NULs)
on sudden power loss or restart.

Microsoft documentation for reference:
https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/fopen-wfopen?view=vs-2019
https://docs.microsoft.com/en-us/cpp/c-runtime-library/stream-i-o?view=vs-2019

Fix #6133, close #8952
This commit is contained in:
Pavel Nedev 2020-10-05 14:40:13 +03:00 committed by Don HO
parent 8426c9ccd9
commit a103151774
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -125,7 +125,7 @@ generic_string relativeFilePathToFullFilePath(const TCHAR *relativeFilePath)
void writeFileContent(const TCHAR *file2write, const char *content2write) void writeFileContent(const TCHAR *file2write, const char *content2write)
{ {
FILE *f = generic_fopen(file2write, TEXT("w+")); FILE *f = generic_fopen(file2write, TEXT("w+c"));
fwrite(content2write, sizeof(content2write[0]), strlen(content2write), f); fwrite(content2write, sizeof(content2write[0]), strlen(content2write), f);
fflush(f); fflush(f);
fclose(f); fclose(f);
@ -134,7 +134,7 @@ void writeFileContent(const TCHAR *file2write, const char *content2write)
void writeLog(const TCHAR *logFileName, const char *log2write) void writeLog(const TCHAR *logFileName, const char *log2write)
{ {
FILE *f = generic_fopen(logFileName, TEXT("a+")); FILE *f = generic_fopen(logFileName, TEXT("a+c"));
fwrite(log2write, sizeof(log2write[0]), strlen(log2write), f); fwrite(log2write, sizeof(log2write[0]), strlen(log2write), f);
fputc('\n', f); fputc('\n', f);
fflush(f); fflush(f);

7
PowerEditor/src/ScitillaComponent/Buffer.cpp
View File

@ -879,7 +879,7 @@ bool FileManager::backupCurrentBuffer()
::SetFileAttributes(fullpath, dwFileAttribs); ::SetFileAttributes(fullpath, dwFileAttribs);
} }
FILE *fp = UnicodeConvertor.fopen(fullpath, TEXT("wb")); FILE *fp = UnicodeConvertor.fopen(fullpath, TEXT("wbc"));
if (fp) if (fp)
{ {
int lengthDoc = _pNotepadPlus->_pEditView->getCurrentDocLen(); int lengthDoc = _pNotepadPlus->_pEditView->getCurrentDocLen();
@ -1004,7 +1004,7 @@ bool FileManager::saveBuffer(BufferID id, const TCHAR * filename, bool isCopy, g
int encoding = buffer->getEncoding(); int encoding = buffer->getEncoding();
FILE *fp = UnicodeConvertor.fopen(fullpath, TEXT("wb")); FILE *fp = UnicodeConvertor.fopen(fullpath, TEXT("wbc"));
if (fp) if (fp)
{ {
_pscratchTilla->execute(SCI_SETDOCPOINTER, 0, buffer->_doc); //generate new document _pscratchTilla->execute(SCI_SETDOCPOINTER, 0, buffer->_doc); //generate new document
@ -1495,9 +1495,10 @@ BufferID FileManager::getBufferFromDocument(Document doc)
bool FileManager::createEmptyFile(const TCHAR * path) bool FileManager::createEmptyFile(const TCHAR * path)
{ {
FILE * file = generic_fopen(path, TEXT("wb")); FILE * file = generic_fopen(path, TEXT("wbc"));
if (!file) if (!file)
return false; return false;
fflush(file);
fclose(file); fclose(file);
return true; return true;
} }

6
PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.cpp
View File

@ -816,10 +816,11 @@ bool TiXmlDocumentA::LoadUnicodeFilePath( const TCHAR* filename )
bool TiXmlDocumentA::SaveFile( const char * filename ) const bool TiXmlDocumentA::SaveFile( const char * filename ) const
{ {
// The old c stuff lives on... // The old c stuff lives on...
FILE* fp = fopen( filename, "w" ); FILE* fp = fopen( filename, "wc" );
if ( fp ) if ( fp )
{ {
Print( fp, 0 ); Print( fp, 0 );
fflush( fp );
fclose( fp ); fclose( fp );
return true; return true;
} }
@ -828,10 +829,11 @@ bool TiXmlDocumentA::SaveFile( const char * filename ) const
bool TiXmlDocumentA::SaveUnicodeFilePath( const TCHAR* filename ) const bool TiXmlDocumentA::SaveUnicodeFilePath( const TCHAR* filename ) const
{ {
// The old c stuff lives on... // The old c stuff lives on...
FILE* fp = generic_fopen( filename, TEXT("w") ); FILE* fp = generic_fopen( filename, TEXT("wc") );
if ( fp ) if ( fp )
{ {
Print( fp, 0 ); Print( fp, 0 );
fflush( fp );
fclose( fp ); fclose( fp );
return true; return true;
} }

3
PowerEditor/src/TinyXml/tinyxml.cpp
View File

@ -755,10 +755,11 @@ bool TiXmlDocument::LoadFile( const TCHAR* filename )
bool TiXmlDocument::SaveFile( const TCHAR * filename ) const bool TiXmlDocument::SaveFile( const TCHAR * filename ) const
{ {
// The old c stuff lives on... // The old c stuff lives on...
FILE* fp = generic_fopen( filename, TEXT("w") ); FILE* fp = generic_fopen( filename, TEXT("wc") );
if ( fp ) if ( fp )
{ {
Print( fp, 0 ); Print( fp, 0 );
fflush( fp );
fclose( fp ); fclose( fp );
return true; return true;
} }

9
PowerEditor/src/Utf8_16.cpp
View File

@ -360,7 +360,7 @@ size_t Utf8_16_Write::fwrite(const void* p, size_t _size)
default: default:
break; break;
} }
return ret; return ret;
} }
@ -435,10 +435,17 @@ void Utf8_16_Write::setEncoding(UniMode eType)
void Utf8_16_Write::fclose() void Utf8_16_Write::fclose()
{ {
if (m_pNewBuf) if (m_pNewBuf)
{
delete [] m_pNewBuf; delete [] m_pNewBuf;
m_pNewBuf = NULL;
}
if (m_pFile) if (m_pFile)
{
::fflush(m_pFile);
::fclose(m_pFile); ::fclose(m_pFile);
m_pFile = NULL;
}
} }