#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include "lib/debug.h"
#include "mutt.h"
#include "message.h"
#include "mx.h"
-#include "ascii.h"
#include "imap_private.h"
#include <ctype.h>
cmd_make_sequence (idata);
/* seq, space, cmd, \r\n\0 */
- outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
+ outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
out = p_new(char, outlen);
snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
/* imap_code: returns 1 if the command result was OK, or 0 if NO or BAD */
int imap_code (const char *s)
{
- s += SEQLEN;
- SKIPWS (s);
- return (ascii_strncasecmp ("OK", s, 2) == 0);
+ s = vskipspaces(s + SEQLEN);
+ return !ascii_strncasecmp("OK", s, 2);
}
/* imap_exec: execute a command, and wait for the response from the server.
/* create sequence for command */
cmd_make_sequence (idata);
/* seq, space, cmd, \r\n\0 */
- outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
+ outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
out = p_new(char, outlen);
snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
return 0;
/* server shut down our connection */
- s += 3;
- SKIPWS (s);
+ s = vskipspaces(s + 3);
mutt_error ("%s", s);
mutt_sleep (2);
cmd_handle_fatal (idata);
s = imap_next_word (s);
p_delete(&idata->capstr);
- idata->capstr = str_dup (s);
+ idata->capstr = m_strdup(s);
- memset (idata->capabilities, 0, sizeof (idata->capabilities));
+ p_clear(idata->capabilities, 1);
while (*s) {
for (x = 0; x < CAPMAX; x++)
imap_unmunge_mbox_name (s);
debug_print (2, ("Subscribing to %s\n", s));
- strfcpy (buf, "mailboxes \"", sizeof (buf));
+ m_strcpy(buf, sizeof(buf), "mailboxes \"");
mutt_account_tourl (&idata->conn->account, &url);
url.path = s;
- if (!str_cmp (url.user, ImapUser))
+ if (!m_strcmp(url.user, ImapUser))
url.user = NULL;
url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
- str_cat (buf, sizeof (buf), "\"");
- memset (&token, 0, sizeof (token));
+ m_strcat(buf, sizeof(buf), "\"");
+ p_clear(&token, 1);
err.data = errstr;
err.dsize = sizeof (errstr);
if (mutt_parse_rc_line (buf, &token, &err))
s = imap_next_word (s);
/* zero out current rights set */
- memset (idata->rights, 0, sizeof (idata->rights));
+ p_clear(idata->rights, 1);
while (*s && !isspace ((unsigned char) *s)) {
switch (*s) {