GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem with maildir and ':' in filename on Windows.

Browse Source
This commit is contained in:
Vincent Richard 2005-11-27 21:02:50 +00:00
parent 1b6fb91cad
commit 594dfdbd55
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2,6 +2,11 @@
VERSION 0.8.1cvs VERSION 0.8.1cvs
================ ================
2005-11-27 Vincent Richard <vincent@vincent-richard.net>
* maildirUtils.cpp: fixed problem with ':' in filename on Windows
platform (thanks to Benjamin Biron).
2005-11-07 Vincent Richard <vincent@vincent-richard.net> 2005-11-07 Vincent Richard <vincent@vincent-richard.net>
* SMTPTransport.cpp: fixed bug in disconnect() when authentication is * SMTPTransport.cpp: fixed bug in disconnect() when authentication is

37
src/net/maildir/maildirUtils.cpp
View File

@ -102,11 +102,29 @@ const bool maildirUtils::isMessageFile(const utility::file& file)
} }
// NOTE ABOUT ID/FLAGS SEPARATOR
// -----------------------------
// In the maildir specification, the character ':' is used to separate
// the unique identifier and the message flags.
//
// On Windows (and particularly FAT file systems), ':' is not allowed
// in a filename, so we use a dash ('-') instead. This is the solution
// used by Mutt/Win32, so we also use it here.
//
// To be compatible between implementations, we check for both
// characters when reading file names.
const utility::file::path::component maildirUtils::extractId const utility::file::path::component maildirUtils::extractId
(const utility::file::path::component& filename) (const utility::file::path::component& filename)
{ {
string::size_type sep = filename.getBuffer().rfind(':'); string::size_type sep = filename.getBuffer().rfind(':'); // try colon
if (sep == string::npos) return (filename);
if (sep == string::npos)
{
sep = filename.getBuffer().rfind('-'); // try dash (Windows)
if (sep == string::npos) return (filename);
}
return (utility::path::component return (utility::path::component
(string(filename.getBuffer().begin(), filename.getBuffer().begin() + sep))); (string(filename.getBuffer().begin(), filename.getBuffer().begin() + sep)));
@ -115,8 +133,13 @@ const utility::file::path::component maildirUtils::extractId
const int maildirUtils::extractFlags(const utility::file::path::component& comp) const int maildirUtils::extractFlags(const utility::file::path::component& comp)
{ {
string::size_type sep = comp.getBuffer().rfind(':'); string::size_type sep = comp.getBuffer().rfind(':'); // try colon
if (sep == string::npos) return (0);
if (sep == string::npos)
{
sep = comp.getBuffer().rfind('-'); // try dash (Windows)
if (sep == string::npos) return 0;
}
const string flagsString(comp.getBuffer().begin() + sep + 1, comp.getBuffer().end()); const string flagsString(comp.getBuffer().begin() + sep + 1, comp.getBuffer().end());
const string::size_type count = flagsString.length(); const string::size_type count = flagsString.length();
@ -166,7 +189,11 @@ const utility::file::path::component maildirUtils::buildFilename
const utility::file::path::component maildirUtils::buildFilename const utility::file::path::component maildirUtils::buildFilename
(const utility::file::path::component& id, const utility::file::path::component& flags) (const utility::file::path::component& id, const utility::file::path::component& flags)
{ {
return (utility::path::component(id.getBuffer() + ":" + flags.getBuffer())); #if VMIME_BUILTIN_PLATFORM_WINDOWS
return (utility::path::component(id.getBuffer() + "-" + flags.getBuffer())); // use dash
#else
return (utility::path::component(id.getBuffer() + ":" + flags.getBuffer())); // use colon
#endif
} }