/* general IMAP utility functions */
-#include "config.h"
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
+#include <signal.h>
+#include <netdb.h>
#include "mutt.h"
#include "mx.h" /* for M_IMAP */
-#include "url.h"
#include "imap_private.h"
-#include "mutt_ssl.h"
-
-#include <lib-lib/macros.h>
-#include "lib/debug.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
-#include <errno.h>
+#include <lib-sys/mutt_ssl.h>
/* -- public functions -- */
ImapPort = ntohs (service->s_port);
else
ImapPort = IMAP_PORT;
- debug_print (3, ("Using default IMAP port %d\n", ImapPort));
}
if (!ImapsPort) {
service = getservbyname ("imaps", "tcp");
ImapsPort = ntohs (service->s_port);
else
ImapsPort = IMAP_SSL_PORT;
- debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));
}
/* Defaults */
return;
p_delete(&(*idata)->capstr);
- mutt_free_list (&(*idata)->flags);
+ string_list_wipe(&(*idata)->flags);
p_delete(&((*idata)->cmd.buf));
p_delete(idata);
}
* Moreover, IMAP servers may dislike the path ending with the delimiter.
*/
char *imap_fix_path (IMAP_DATA * idata, char *mailbox, char *path,
- size_t plen)
+ ssize_t plen)
{
int x = 0;
if (!mailbox || !*mailbox) {
- strfcpy (path, "INBOX", plen);
+ m_strcpy(path, plen, "INBOX");
return path;
}
s++;
}
- SKIPWS (s);
- return s;
+ return vskipspaces(s);
}
/* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
*
*/
-static RETSIGTYPE alrm_handler (int sig)
+static RETSIGTYPE alrm_handler (int sig __attribute__((unused)))
{
/* empty */
}