projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make taht shorter
[apps/madmutt.git]
/
imap
/
command.c
diff --git
a/imap/command.c
b/imap/command.c
index
411dc50
..
6968334
100644
(file)
--- a/
imap/command.c
+++ b/
imap/command.c
@@
-19,8
+19,8
@@
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
-#include "lib/debug.h"
#include "mutt.h"
#include "message.h"
#include "mutt.h"
#include "message.h"
@@
-155,9
+155,8
@@
int imap_cmd_step (IMAP_DATA * idata)
/* imap_code: returns 1 if the command result was OK, or 0 if NO or BAD */
int imap_code (const char *s)
{
/* 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.
}
/* imap_exec: execute a command, and wait for the response from the server.
@@
-367,8
+366,7
@@
static int cmd_handle_untagged (IMAP_DATA * idata)
return 0;
/* server shut down our connection */
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);
mutt_error ("%s", s);
mutt_sleep (2);
cmd_handle_fatal (idata);
@@
-569,13
+567,13
@@
static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
imap_unmunge_mbox_name (s);
debug_print (2, ("Subscribing to %s\n", s));
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;
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);
url.user = NULL;
url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
-
str_cat (buf, sizeof
(buf), "\"");
+
m_strcat(buf, sizeof
(buf), "\"");
p_clear(&token, 1);
err.data = errstr;
err.dsize = sizeof (errstr);
p_clear(&token, 1);
err.data = errstr;
err.dsize = sizeof (errstr);