/*
* $Id$
*
+ * Copyright (c) 1987-2010 by the citadel.org team
*
+ * 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.
*
- * Copyright (c) 2001-2009 by the citadel.org team
+ * 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.
*
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "support.h"
#include "config.h"
#include "user_ops.h"
-#include "policy.h"
#include "database.h"
#include "msgbase.h"
#include "internet_addressing.h"
-#include "serv_imap.h"
#include "imap_tools.h"
+#include "serv_imap.h"
#include "imap_fetch.h"
#include "imap_misc.h"
#include "genstamp.h"
* imap_copy() calls imap_do_copy() to do its actual work, once it's
* validated and boiled down the request a bit. (returns 0 on success)
*/
-int imap_do_copy(char *destination_folder) {
+int imap_do_copy(const char *destination_folder) {
int i;
char roomname[ROOMNAMELEN];
struct ctdlroom qrbuf;
}
if (num_selected > 0) {
- CtdlSaveMsgPointersInRoom(roomname, selected_msgs, num_selected, 1, NULL);
+ CtdlSaveMsgPointersInRoom(roomname, selected_msgs, num_selected, 1, NULL, 0);
}
free(selected_msgs);
/*
* This function is called by the main command loop.
*/
-void imap_copy(int num_parms, char *parms[]) {
+void imap_copy(int num_parms, ConstStr *Params) {
int ret;
if (num_parms != 4) {
- cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ cprintf("%s BAD invalid parameters\r\n", Params[0].Key);
return;
}
- if (imap_is_message_set(parms[2])) {
- imap_pick_range(parms[2], 0);
+ if (imap_is_message_set(Params[2].Key)) {
+ imap_pick_range(Params[2].Key, 0);
}
else {
- cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ cprintf("%s BAD invalid parameters\r\n", Params[0].Key);
return;
}
- ret = imap_do_copy(parms[3]);
+ ret = imap_do_copy(Params[3].Key);
if (!ret) {
- cprintf("%s OK ", parms[0]);
+ cprintf("%s OK ", Params[0].Key);
imap_output_copyuid_response();
cprintf("COPY completed\r\n");
}
else {
- cprintf("%s NO COPY failed (error %d)\r\n", parms[0], ret);
+ cprintf("%s NO COPY failed (error %d)\r\n", Params[0].Key, ret);
}
}
/*
* This function is called by the main command loop.
*/
-void imap_uidcopy(int num_parms, char *parms[]) {
+void imap_uidcopy(int num_parms, ConstStr *Params) {
if (num_parms != 5) {
- cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ cprintf("%s BAD invalid parameters\r\n", Params[0].Key);
return;
}
- if (imap_is_message_set(parms[3])) {
- imap_pick_range(parms[3], 1);
+ if (imap_is_message_set(Params[3].Key)) {
+ imap_pick_range(Params[3].Key, 1);
}
else {
- cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ cprintf("%s BAD invalid parameters\r\n", Params[0].Key);
return;
}
- if (imap_do_copy(parms[4]) == 0) {
- cprintf("%s OK ", parms[0]);
+ if (imap_do_copy(Params[4].Key) == 0) {
+ cprintf("%s OK ", Params[0].Key);
imap_output_copyuid_response();
cprintf("UID COPY completed\r\n");
}
else {
- cprintf("%s NO UID COPY failed\r\n", parms[0]);
+ cprintf("%s NO UID COPY failed\r\n", Params[0].Key);
}
}
/*
* This function is called by the main command loop.
*/
-void imap_append(int num_parms, char *parms[]) {
+void imap_append(int num_parms, ConstStr *Params) {
long literal_length;
long bytes_transferred;
- long stripped_length = 0;
struct CtdlMessage *msg = NULL;
long new_msgnum = (-1L);
int ret = 0;
char roomname[ROOMNAMELEN];
- char buf[SIZ];
+ char errbuf[SIZ];
+ char dummy[SIZ];
char savedroom[ROOMNAMELEN];
int msgs, new;
int i;
char new_message_flags[SIZ];
- struct citimap *Imap;
+ citimap *Imap;
if (num_parms < 4) {
- cprintf("%s BAD usage error\r\n", parms[0]);
+ cprintf("%s BAD usage error\r\n", Params[0].Key);
return;
}
- if ( (parms[num_parms-1][0] != '{')
- || (parms[num_parms-1][strlen(parms[num_parms-1])-1] != '}') ) {
- cprintf("%s BAD no message literal supplied\r\n", parms[0]);
+ if ( (Params[num_parms-1].Key[0] != '{')
+ || (Params[num_parms-1].Key[Params[num_parms-1].len-1] != '}') ) {
+ cprintf("%s BAD no message literal supplied\r\n", Params[0].Key);
return;
}
strcpy(new_message_flags, "");
if (num_parms >= 5) {
for (i=3; i<num_parms; ++i) {
- strcat(new_message_flags, parms[i]);
+ strcat(new_message_flags, Params[i].Key);
strcat(new_message_flags, " ");
}
stripallbut(new_message_flags, '(', ')');
* }
*/
- literal_length = atol(&parms[num_parms-1][1]);
+ literal_length = atol(&Params[num_parms-1].Key[1]);
if (literal_length < 1) {
cprintf("%s BAD Message length must be at least 1.\r\n",
- parms[0]);
+ Params[0].Key);
return;
}
Imap = IMAP;
imap_free_transmitted_message(); /* just in case. */
- Imap->transmitted_message = malloc(literal_length + 1);
- if (Imap->transmitted_message == NULL) {
- cprintf("%s NO Cannot allocate memory.\r\n", parms[0]);
+
+ Imap->TransmittedMessage = NewStrBufPlain(NULL, literal_length);
+
+ if (Imap->TransmittedMessage == NULL) {
+ cprintf("%s NO Cannot allocate memory.\r\n", Params[0].Key);
return;
}
- Imap->transmitted_length = literal_length;
-
+
cprintf("+ Transmit message now.\r\n");
bytes_transferred = 0;
+ client_read_blob(Imap->TransmittedMessage, literal_length, config.c_sleeping);
- ret = client_read(Imap->transmitted_message, literal_length);
- Imap->transmitted_message[literal_length] = 0;
-
- if (ret != 1) {
- cprintf("%s NO Read failed.\r\n", parms[0]);
+ if ((ret < 0) || (StrLength(Imap->TransmittedMessage) < literal_length)) {
+ cprintf("%s NO Read failed.\r\n", Params[0].Key);
return;
}
* text) is received. This call to client_getln() absorbs it.
*/
flush_output();
- client_getln(buf, sizeof buf);
+ client_getln(dummy, sizeof dummy);
/* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */
CtdlLogPrintf(CTDL_DEBUG, "Converting CRLF to LF\n");
- stripped_length = 0;
- for (i=0; i<literal_length; ++i) {
- if (strncmp(&Imap->transmitted_message[i], "\r\n", 2)) {
- Imap->transmitted_message[stripped_length++] =
- Imap->transmitted_message[i];
- }
- }
- literal_length = stripped_length;
- Imap->transmitted_message[literal_length] = 0; /* reterminate it */
+ StrBufToUnixLF(Imap->TransmittedMessage);
CtdlLogPrintf(CTDL_DEBUG, "Converting message format\n");
- msg = convert_internet_message(Imap->transmitted_message);
- Imap->transmitted_message = NULL;
- Imap->transmitted_length = 0;
+ msg = convert_internet_message_buf(&Imap->TransmittedMessage);
- ret = imap_grabroom(roomname, parms[2], 1);
+ ret = imap_grabroom(roomname, Params[2].Key, 1);
if (ret != 0) {
cprintf("%s NO Invalid mailbox name or access denied\r\n",
- parms[0]);
+ Params[0].Key);
return;
}
/*
* Can we post here?
*/
- ret = CtdlDoIHavePermissionToPostInThisRoom(buf, sizeof buf, NULL, POST_LOGGED_IN);
+ ret = CtdlDoIHavePermissionToPostInThisRoom(errbuf, sizeof errbuf, NULL, POST_LOGGED_IN);
if (ret) {
/* Nope ... print an error message */
- cprintf("%s NO %s\r\n", parms[0], buf);
+ cprintf("%s NO %s\r\n", Params[0].Key, errbuf);
}
else {
}
if (new_msgnum >= 0L) {
cprintf("%s OK [APPENDUID %ld %ld] APPEND completed\r\n",
- parms[0], GLOBAL_UIDVALIDITY_VALUE, new_msgnum);
+ Params[0].Key, GLOBAL_UIDVALIDITY_VALUE, new_msgnum);
}
else {
cprintf("%s BAD Error %ld saving message to disk.\r\n",
- parms[0], new_msgnum);
+ Params[0].Key, new_msgnum);
}
}
projects / citadel.git / blobdiff