#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/enter.h>
-#include "lib/debug.h"
#include "mutt.h"
-#include "ascii.h"
-#include "enter.h"
#include "imap_private.h"
/* -- forward declarations -- */
save_lsub = option (OPTIMAPCHECKSUBSCRIBED);
unset_option (OPTIMAPCHECKSUBSCRIBED);
- strfcpy (list_cmd, option (OPTIMAPLSUB) ? "LSUB" : "LIST",
- sizeof (list_cmd));
+ m_strcpy(list_cmd, sizeof(list_cmd),
+ option(OPTIMAPLSUB) ? "LSUB" : "LIST");
if (!(idata = imap_conn_find (&(mx.account), 0)))
goto fail;
imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
imap_munge_mbox_name (buf, sizeof (buf), mbox);
imap_unquote_string (buf); /* As kludgy as it gets */
- mbox[sizeof (mbox) - 1] = '\0';
- strncpy (mbox, buf, sizeof (mbox) - 1);
+ m_strcpy(mbox, sizeof(mbox), buf);
n = m_strlen(mbox);
debug_print (3, ("mbox: %s\n", mbox));
goto fail;
}
- strfcpy (buf, NONULL (mx.mbox), sizeof (buf));
+ m_strcpy(buf, sizeof(buf), NONULL(mx.mbox));
/* append a delimiter if necessary */
n = m_strlen(buf);
if (isparent)
noselect = 1;
/* prune current folder from output */
- if (isparent || str_ncmp (name, mx.mbox, m_strlen(name)))
+ if (isparent || m_strncmp(name, mx.mbox, m_strlen(name)))
imap_add_folder (idata->delim, name, noselect, noinferiors, state,
isparent);
}
/* render superiors as unix-standard ".." */
if (isparent)
- strfcpy (relpath, "../", sizeof (relpath));
+ m_strcpy(relpath, sizeof(relpath), "../");
/* strip current folder from target, to render a relative path */
- else if (!str_ncmp (mx.mbox, folder, m_strlen(mx.mbox)))
- strfcpy (relpath, folder + m_strlen(mx.mbox), sizeof (relpath));
+ else if (!m_strncmp(mx.mbox, folder, m_strlen(mx.mbox)))
+ m_strcpy(relpath, sizeof(relpath), folder + m_strlen(mx.mbox));
else
- strfcpy (relpath, folder, sizeof (relpath));
+ m_strcpy(relpath, sizeof(relpath), folder);
/* apply filemask filter. This should really be done at menu setup rather
* than at scan, since it's so expensive to scan. But that's big changes
static int compare_names (struct folder_file *a, struct folder_file *b)
{
- return str_cmp (a->name, b->name);
+ return m_strcmp(a->name, b->name);
}
static int browse_get_namespace (IMAP_DATA * idata, char *nsbuf, int nsblen,