aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/imap/IMAPConnection.cpp2
-rw-r--r--src/net/imap/IMAPStore.cpp2
-rw-r--r--src/net/maildir/maildirFolder.cpp26
-rw-r--r--src/net/maildir/maildirMessage.cpp8
-rw-r--r--src/net/maildir/maildirStore.cpp6
-rw-r--r--src/net/maildir/maildirUtils.cpp1
-rw-r--r--src/net/pop3/POP3Store.cpp6
-rw-r--r--src/net/sendmail/sendmailTransport.cpp6
-rw-r--r--src/net/service.cpp4
-rw-r--r--src/net/smtp/SMTPResponse.cpp4
-rw-r--r--src/net/smtp/SMTPTransport.cpp6
-rw-r--r--src/net/tls/TLSSocket.cpp6
12 files changed, 38 insertions, 39 deletions
diff --git a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp
index 7f13cf48..5e995aac 100644
--- a/src/net/imap/IMAPConnection.cpp
+++ b/src/net/imap/IMAPConnection.cpp
@@ -23,7 +23,7 @@
#include "vmime/net/imap/IMAPStore.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include "vmime/net/defaultConnectionInfos.hpp"
diff --git a/src/net/imap/IMAPStore.cpp b/src/net/imap/IMAPStore.cpp
index e6f82c70..aba3e8c2 100644
--- a/src/net/imap/IMAPStore.cpp
+++ b/src/net/imap/IMAPStore.cpp
@@ -22,7 +22,7 @@
#include "vmime/net/imap/IMAPConnection.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include <map>
diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp
index dc89f131..cbacff02 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/net/maildir/maildirFolder.cpp
@@ -28,7 +28,7 @@
#include "vmime/message.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
namespace vmime {
@@ -91,7 +91,7 @@ const int maildirFolder::getFlags()
{
int flags = 0;
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
ref <utility::file> rootDir = fsf->create
(maildirUtils::getFolderFSPath(m_store.acquire(), m_path, maildirUtils::FOLDER_PATH_CONTAINER));
@@ -207,7 +207,7 @@ void maildirFolder::create(const int /* type */)
// Create directory on file system
try
{
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
if (!fsf->isValidPath(maildirUtils::getFolderFSPath(store, m_path, maildirUtils::FOLDER_PATH_ROOT)))
throw exceptions::invalid_folder_name();
@@ -252,7 +252,7 @@ void maildirFolder::destroy()
throw exceptions::illegal_state("Folder is open");
// Delete 'folder' and '.folder.directory' directories
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
ref <utility::file> rootDir = fsf->create
(maildirUtils::getFolderFSPath(store, m_path, maildirUtils::FOLDER_PATH_ROOT));
@@ -282,7 +282,7 @@ const bool maildirFolder::exists()
{
ref <maildirStore> store = m_store.acquire();
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
ref <utility::file> rootDir = fsf->create
(maildirUtils::getFolderFSPath(store, m_path, maildirUtils::FOLDER_PATH_ROOT));
@@ -316,7 +316,7 @@ void maildirFolder::scanFolder()
m_messageCount = 0;
m_unreadMessageCount = 0;
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
utility::file::path newDirPath = maildirUtils::getFolderFSPath
(store, m_path, maildirUtils::FOLDER_PATH_NEW);
@@ -531,7 +531,7 @@ void maildirFolder::listFolders(std::vector <ref <folder> >& list, const bool re
try
{
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
ref <utility::file> rootDir = fsf->create
(maildirUtils::getFolderFSPath(store, m_path,
@@ -585,7 +585,7 @@ void maildirFolder::rename(const folder::path& newPath)
throw exceptions::invalid_folder_name();
// Rename the directory on the file system
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
ref <utility::file> rootDir = fsf->create
(maildirUtils::getFolderFSPath(store, m_path, maildirUtils::FOLDER_PATH_ROOT));
@@ -872,7 +872,7 @@ void maildirFolder::setMessageFlagsImpl
{
ref <maildirStore> store = m_store.acquire();
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
utility::file::path curDirPath = maildirUtils::getFolderFSPath
(store, m_path, maildirUtils::FOLDER_PATH_CUR);
@@ -944,7 +944,7 @@ void maildirFolder::addMessage(utility::inputStream& is, const int size,
else if (m_mode == MODE_READ_ONLY)
throw exceptions::illegal_state("Folder is read-only");
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
utility::file::path tmpDirPath = maildirUtils::getFolderFSPath
(store, m_path, maildirUtils::FOLDER_PATH_TMP);
@@ -1026,7 +1026,7 @@ void maildirFolder::copyMessageImpl(const utility::file::path& tmpDirPath,
utility::inputStream& is, const utility::stream::size_type size,
utility::progressListener* progress)
{
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
ref <utility::file> file = fsf->create(tmpDirPath / filename);
@@ -1163,7 +1163,7 @@ void maildirFolder::copyMessagesImpl(const folder::path& dest, const std::vector
{
ref <maildirStore> store = m_store.acquire();
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
utility::file::path curDirPath = maildirUtils::getFolderFSPath
(store, m_path, maildirUtils::FOLDER_PATH_CUR);
@@ -1305,7 +1305,7 @@ void maildirFolder::expunge()
else if (m_mode == MODE_READ_ONLY)
throw exceptions::illegal_state("Folder is read-only");
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
utility::file::path curDirPath = maildirUtils::getFolderFSPath
(store, m_path, maildirUtils::FOLDER_PATH_CUR);
diff --git a/src/net/maildir/maildirMessage.cpp b/src/net/maildir/maildirMessage.cpp
index 6c621f21..aaf258a8 100644
--- a/src/net/maildir/maildirMessage.cpp
+++ b/src/net/maildir/maildirMessage.cpp
@@ -25,7 +25,7 @@
#include "vmime/message.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
namespace vmime {
@@ -342,7 +342,7 @@ void maildirMessage::extractImpl(utility::outputStream& os, utility::progressLis
{
ref <const maildirFolder> folder = m_folder.acquire();
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
const utility::file::path path = folder->getMessageFSPath(m_num);
ref <utility::file> file = fsf->create(path);
@@ -389,7 +389,7 @@ void maildirMessage::fetchPartHeader(ref <part> p)
ref <maildirPart> mp = p.dynamicCast <maildirPart>();
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
const utility::file::path path = folder->getMessageFSPath(m_num);
ref <utility::file> file = fsf->create(path);
@@ -426,7 +426,7 @@ void maildirMessage::fetch(ref <maildirFolder> msgFolder, const int options)
if (folder != msgFolder)
throw exceptions::folder_not_found();
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
const utility::file::path path = folder->getMessageFSPath(m_num);
ref <utility::file> file = fsf->create(path);
diff --git a/src/net/maildir/maildirStore.cpp b/src/net/maildir/maildirStore.cpp
index 4cea5ec3..836a639f 100644
--- a/src/net/maildir/maildirStore.cpp
+++ b/src/net/maildir/maildirStore.cpp
@@ -24,7 +24,7 @@
#include "vmime/utility/smartPtr.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include "vmime/net/defaultConnectionInfos.hpp"
@@ -101,7 +101,7 @@ ref <folder> maildirStore::getFolder(const folder::path& path)
const bool maildirStore::isValidFolderName(const folder::path::component& name) const
{
- if (!platformDependant::getHandler()->getFileSystemFactory()->isValidPathComponent(name))
+ if (!platform::getHandler()->getFileSystemFactory()->isValidPathComponent(name))
return false;
const string& buf = name.getBuffer();
@@ -127,7 +127,7 @@ void maildirStore::connect()
throw exceptions::already_connected();
// Get root directory
- utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
+ utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory();
m_fsPath = fsf->stringToPath(GET_PROPERTY(string, PROPERTY_SERVER_ROOTPATH));
diff --git a/src/net/maildir/maildirUtils.cpp b/src/net/maildir/maildirUtils.cpp
index 00a9a7b1..004c2553 100644
--- a/src/net/maildir/maildirUtils.cpp
+++ b/src/net/maildir/maildirUtils.cpp
@@ -23,7 +23,6 @@
#include "vmime/utility/random.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
namespace vmime {
diff --git a/src/net/pop3/POP3Store.cpp b/src/net/pop3/POP3Store.cpp
index ba4a5254..10a67c4a 100644
--- a/src/net/pop3/POP3Store.cpp
+++ b/src/net/pop3/POP3Store.cpp
@@ -21,7 +21,7 @@
#include "vmime/net/pop3/POP3Folder.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include "vmime/messageId.hpp"
#include "vmime/security/digest/messageDigestFactory.hpp"
#include "vmime/utility/filteredStream.hpp"
@@ -773,7 +773,7 @@ void POP3Store::readResponse(string& buffer, const bool multiLine,
if (receiveBuffer.empty()) // buffer is empty
{
- platformDependant::getHandler()->wait();
+ platform::getHandler()->wait();
continue;
}
@@ -874,7 +874,7 @@ void POP3Store::readResponse(utility::outputStream& os,
if (read == 0) // buffer is empty
{
- platformDependant::getHandler()->wait();
+ platform::getHandler()->wait();
continue;
}
diff --git a/src/net/sendmail/sendmailTransport.cpp b/src/net/sendmail/sendmailTransport.cpp
index efdd57aa..54fe90ae 100644
--- a/src/net/sendmail/sendmailTransport.cpp
+++ b/src/net/sendmail/sendmailTransport.cpp
@@ -20,7 +20,7 @@
#include "vmime/net/sendmail/sendmailTransport.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include "vmime/message.hpp"
#include "vmime/mailboxList.hpp"
@@ -165,11 +165,11 @@ void sendmailTransport::internalSend
(const std::vector <string> args, utility::inputStream& is,
const utility::stream::size_type size, utility::progressListener* progress)
{
- const utility::file::path path = vmime::platformDependant::getHandler()->
+ const utility::file::path path = vmime::platform::getHandler()->
getFileSystemFactory()->stringToPath(m_sendmailPath);
ref <utility::childProcess> proc =
- vmime::platformDependant::getHandler()->
+ vmime::platform::getHandler()->
getChildProcessFactory()->create(path);
proc->start(args, utility::childProcess::FLAG_REDIRECT_STDIN);
diff --git a/src/net/service.cpp b/src/net/service.cpp
index 456af895..f603f30f 100644
--- a/src/net/service.cpp
+++ b/src/net/service.cpp
@@ -20,7 +20,7 @@
#include "vmime/config.hpp"
#include "vmime/net/service.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#if VMIME_HAVE_SASL_SUPPORT
#include "vmime/security/sasl/defaultSASLAuthenticator.hpp"
@@ -56,7 +56,7 @@ service::service(ref <session> sess, const serviceInfos& /* infos */,
m_certVerifier = vmime::create <security::cert::defaultCertificateVerifier>();
#endif // VMIME_HAVE_TLS_SUPPORT
- m_socketFactory = platformDependant::getHandler()->getSocketFactory();
+ m_socketFactory = platform::getHandler()->getSocketFactory();
}
diff --git a/src/net/smtp/SMTPResponse.cpp b/src/net/smtp/SMTPResponse.cpp
index b27876f6..9be76d1d 100644
--- a/src/net/smtp/SMTPResponse.cpp
+++ b/src/net/smtp/SMTPResponse.cpp
@@ -23,7 +23,7 @@
#include "vmime/net/smtp/SMTPResponse.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include "vmime/utility/stringUtils.hpp"
#include "vmime/net/socket.hpp"
@@ -146,7 +146,7 @@ const string SMTPResponse::readResponseLine()
if (receiveBuffer.empty()) // buffer is empty
{
- platformDependant::getHandler()->wait();
+ platform::getHandler()->wait();
continue;
}
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index 07da0e4c..1e873613 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -21,7 +21,7 @@
#include "vmime/net/smtp/SMTPResponse.hpp"
#include "vmime/exception.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include "vmime/encoderB64.hpp"
#include "vmime/mailboxList.hpp"
@@ -189,7 +189,7 @@ void SMTPTransport::helo()
// S: 250-smtp.theserver.com
// S: 250 AUTH CRAM-MD5 DIGEST-MD5
- sendRequest("EHLO " + platformDependant::getHandler()->getHostName());
+ sendRequest("EHLO " + platform::getHandler()->getHostName());
ref <SMTPResponse> resp;
@@ -200,7 +200,7 @@ void SMTPTransport::helo()
// eg: C: HELO thismachine.ourdomain.com
// S: 250 OK
- sendRequest("HELO " + platformDependant::getHandler()->getHostName());
+ sendRequest("HELO " + platform::getHandler()->getHostName());
if ((resp = readResponse())->getCode() != 250)
{
diff --git a/src/net/tls/TLSSocket.cpp b/src/net/tls/TLSSocket.cpp
index b1896844..e36df7b7 100644
--- a/src/net/tls/TLSSocket.cpp
+++ b/src/net/tls/TLSSocket.cpp
@@ -27,7 +27,7 @@
#include "vmime/net/tls/TLSSocket.hpp"
#include "vmime/net/tls/TLSSession.hpp"
-#include "vmime/platformDependant.hpp"
+#include "vmime/platform.hpp"
#include "vmime/security/cert/X509Certificate.hpp"
@@ -159,7 +159,7 @@ void TLSSocket::handshake(ref <timeoutHandler> toHandler)
ret == GNUTLS_E_INTERRUPTED)
{
// Non-fatal error
- platformDependant::getHandler()->wait();
+ platform::getHandler()->wait();
}
else
{
@@ -240,7 +240,7 @@ ssize_t TLSSocket::gnutlsPullFunc
if (ret == 0)
{
// No data available yet
- platformDependant::getHandler()->wait();
+ platform::getHandler()->wait();
}
else
{