2 files changed, 122 insertions, 1 deletions
diff --git a/vmime/net/pop3/POP3Command.hpp b/vmime/net/pop3/POP3Command.hpp
new file mode 100644
index 00000000..68731661
--- /dev/null
+++ b/vmime/net/pop3/POP3Command.hpp
@@ -0,0 +1,118 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#ifndef VMIME_NET_POP3_POP3COMMAND_HPP_INCLUDED
+#define VMIME_NET_POP3_POP3COMMAND_HPP_INCLUDED
+
+
+#include "vmime/config.hpp"
+
+
+#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3
+
+
+#include "vmime/object.hpp"
+#include "vmime/base.hpp"
+
+
+namespace vmime {
+
+
+class mailbox;
+
+
+namespace net {
+
+
+class socket;
+class timeoutHandler;
+
+
+namespace pop3 {
+
+
+/** A POP3 command that will be sent to the server.
+  */
+class VMIME_EXPORT POP3Command : public object
+{
+	friend class vmime::creator;
+
+public:
+
+	static ref <POP3Command> CAPA();
+	static ref <POP3Command> NOOP();
+	static ref <POP3Command> AUTH(const string& mechName);
+	static ref <POP3Command> STLS();
+	static ref <POP3Command> APOP(const string& username, const string& digest);
+	static ref <POP3Command> USER(const string& username);
+	static ref <POP3Command> PASS(const string& password);
+	static ref <POP3Command> STAT();
+	static ref <POP3Command> LIST();
+	static ref <POP3Command> LIST(const unsigned long msg);
+	static ref <POP3Command> UIDL();
+	static ref <POP3Command> UIDL(const unsigned long msg);
+	static ref <POP3Command> DELE(const unsigned long msg);
+	static ref <POP3Command> RETR(const unsigned long msg);
+	static ref <POP3Command> TOP(const unsigned long msg, const unsigned long lines);
+	static ref <POP3Command> RSET();
+	static ref <POP3Command> QUIT();
+
+	/** Creates a new POP3 command with the specified text.
+	  *
+	  * @param text command text
+	  * @return a new POP3Command object
+	  */
+	static ref <POP3Command> createCommand(const string& text);
+
+	/** Sends this command to the specified socket.
+	  *
+	  * @param sok socket to which the command will be written
+	  */
+	virtual void writeToSocket(ref <socket> sok);
+
+	/** Returns the full text of the command, including command name
+	  * and parameters (if any).
+	  *
+	  * @return command text (eg. "LIST 42")
+	  */
+	virtual const string getText() const;
+
+protected:
+
+	POP3Command(const string& text);
+	POP3Command(const POP3Command&);
+
+private:
+
+	string m_text;
+};
+
+
+} // pop3
+} // net
+} // vmime
+
+
+#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3
+
+#endif // VMIME_NET_POP3_POP3COMMAND_HPP_INCLUDED
diff --git a/vmime/net/pop3/POP3Store.hpp b/vmime/net/pop3/POP3Store.hpp
index 2612b407..681a295e 100644
--- a/vmime/net/pop3/POP3Store.hpp
+++ b/vmime/net/pop3/POP3Store.hpp
@@ -48,6 +48,8 @@ namespace pop3 {
 
 
 class POP3Folder;
+class POP3Command;
+class POP3Response;
 
 
 /** POP3 store service.
@@ -98,7 +100,8 @@ private:
 
 	const std::vector <string> getCapabilities();
 
-	void sendRequest(const string& buffer, const bool end = true);
+	void sendRequest(ref <POP3Command> cmd);
+	ref <POP3Response> readResponse();
 
 	void internalDisconnect();