#include <stdlib.h>
#include <ctype.h>
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/intl.h"
+
#include "mutt.h"
#include "imap_private.h"
imap_unquote_string (buf); /* As kludgy as it gets */
mbox[sizeof (mbox) - 1] = '\0';
strncpy (mbox, buf, sizeof (mbox) - 1);
- n = mutt_strlen (mbox);
+ n = safe_strlen (mbox);
dprint (3, (debugfile, "imap_browse: mbox: %s\n", mbox));
imap_unmunge_mbox_name (cur_folder);
if (!noinferiors && cur_folder[0] &&
- (n = strlen (mbox)) < LONG_STRING - 1) {
+ (n = safe_strlen (mbox)) < LONG_STRING - 1) {
mbox[n++] = idata->delim;
mbox[n] = '\0';
}
strfcpy (buf, NONULL (mx.mbox), sizeof (buf));
/* append a delimiter if necessary */
- n = mutt_strlen (buf);
+ n = safe_strlen (buf);
if (n && (n < sizeof (buf) - 1) && (buf[n - 1] != idata->delim)) {
buf[n++] = idata->delim;
buf[n] = '\0';
if (mutt_get_field (_("Create mailbox: "), buf, sizeof (buf), M_FILE) < 0)
goto fail;
- if (!mutt_strlen (buf)) {
+ if (!safe_strlen (buf)) {
mutt_error (_("Mailbox must have a name."));
mutt_sleep (1);
goto fail;
if (mutt_get_field (buf, newname, sizeof (newname), M_FILE) < 0)
goto fail;
- if (!mutt_strlen (newname)) {
+ if (!safe_strlen (newname)) {
mutt_error (_("Mailbox must have a name."));
mutt_sleep (1);
goto fail;
if (isparent)
noselect = 1;
/* prune current folder from output */
- if (isparent || mutt_strncmp (name, mx.mbox, strlen (name)))
+ if (isparent || safe_strncmp (name, mx.mbox, safe_strlen (name)))
imap_add_folder (idata->delim, name, noselect, noinferiors, state,
isparent);
}
if (isparent)
strfcpy (relpath, "../", sizeof (relpath));
/* strip current folder from target, to render a relative path */
- else if (!mutt_strncmp (mx.mbox, folder, mutt_strlen (mx.mbox)))
- strfcpy (relpath, folder + mutt_strlen (mx.mbox), sizeof (relpath));
+ else if (!safe_strncmp (mx.mbox, folder, safe_strlen (mx.mbox)))
+ strfcpy (relpath, folder + safe_strlen (mx.mbox), sizeof (relpath));
else
strfcpy (relpath, folder, sizeof (relpath));
(state->entry)[state->entrylen].name = safe_strdup (tmp);
/* mark desc with delim in browser if it can have subfolders */
- if (!isparent && !noinferiors && strlen (relpath) < sizeof (relpath) - 1) {
- relpath[strlen (relpath) + 1] = '\0';
- relpath[strlen (relpath)] = delim;
+ if (!isparent && !noinferiors && safe_strlen (relpath) < sizeof (relpath) - 1) {
+ relpath[safe_strlen (relpath) + 1] = '\0';
+ relpath[safe_strlen (relpath)] = delim;
}
(state->entry)[state->entrylen].desc = safe_strdup (relpath);
static int compare_names (struct folder_file *a, struct folder_file *b)
{
- return mutt_strcmp (a->name, b->name);
+ return safe_strcmp (a->name, b->name);
}
static int browse_get_namespace (IMAP_DATA * idata, char *nsbuf, int nsblen,