#endif
#include <lib-lib/mem.h>
+#include <lib-lib/buffer.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffy.h"
-#include "buffer.h"
#include "mx.h"
#include "mh.h"
#include "sidebar.h"
int bytes_read;
int i; /* Index into `buffer' for scanning. */
- memset (buffer, 0, sizeof (buffer));
+ p_clear(buffer, 1);
fseeko (f, 0, SEEK_END);
pos = ftello (f);
if (bytes_read == -1)
return -1;
for (i = bytes_read; --i >= 0;)
- if (!str_ncmp (buffer + i, "\n\nFrom ", m_strlen("\n\nFrom "))) { /* found it - go to the beginning of the From */
+ if (!m_strncmp(buffer + i, "\n\nFrom ", m_strlen("\n\nFrom "))) { /* found it - go to the beginning of the From */
fseeko (f, pos + i + 2, SEEK_SET);
return 0;
}
}
/* here we are at the beginning of the file */
- if (!str_ncmp ("From ", buffer, 5)) {
+ if (!m_strncmp("From ", buffer, 5)) {
fseeko (f, 0, 0);
return (0);
}
while (MoreArgs (s)) {
mutt_extract_token (path, s, 0);
- strfcpy (buf, path->data, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), path->data);
if (data == M_UNMAILBOXES && str_eq (buf, "*")) {
list_del (&Incoming, (list_del_t*) buffy_free);
if (tmp->new <= 0 || (have_unnotified && tmp->notified))
continue;
- strfcpy (path, tmp->path, sizeof (path));
+ m_strcpy(path, sizeof(path), tmp->path);
mutt_pretty_mailbox (path);
if (!first && pos + m_strlen(path) >= COLS - 7)
* reported new mail */
buffy_check (0);
} else {
- strfcpy (s, ((BUFFY*) Incoming->data[c])->path, slen);
+ m_strcpy(s, slen, ((BUFFY*)Incoming->data[c])->path);
mutt_pretty_mailbox (s);
}
}