# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "mx.h"
#include "buffy.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <string.h>
#include <ctype.h>
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fmt[SHORT_STRING], tmp[SHORT_STRING], *cp, *p;
+ char fmt[SHORT_STRING], tmp[SHORT_STRING];
+ const char *cp, *p;
int count, optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
#ifdef USE_COMPRESSED
if (Context && Context->compressinfo && Context->realpath) {
if ((p = strrchr (Context->realpath, '/')))
- strfcpy (tmp, p + 1, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), p + 1);
else
- strfcpy (tmp, Context->realpath, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), Context->realpath);
}
else
#endif
if (Context && Context->path) {
if ((p = strrchr (Context->path, '/')))
- strfcpy (tmp, p + 1, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), p + 1);
else
- strfcpy (tmp, Context->path, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), Context->path);
}
else
- strfcpy (tmp, _("no mailbox"), sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), _("no mailbox"));
snprintf (buf, buflen, fmt, tmp);
break;
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
#ifdef USE_COMPRESSED
if (Context && Context->compressinfo && Context->realpath) {
- strfcpy (tmp, Context->realpath, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), Context->realpath);
mutt_pretty_mailbox (tmp);
}
else
#endif
if (Context && Context->path) {
- strfcpy (tmp, Context->path, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), Context->path);
mutt_pretty_mailbox (tmp);
}
else
- strfcpy (tmp, _("(no mailbox)"), sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), _("(no mailbox)"));
snprintf (buf, buflen, fmt, tmp);
break;
if (!StChars)
buf[0] = 0;
- else if (i >= str_len (StChars))
+ else if (i >= m_strlen(StChars))
buf[0] = StChars[0];
else
buf[0] = StChars[i];
break;
case 'v':
- strncpy (buf, mutt_make_version (0), buflen);
+ m_strcpy(buf, buflen, mutt_make_version(0));
break;
case 'V':