#include "mutt.h"
#include "buffy.h"
+#include "buffer.h"
#include "mx.h"
#include "mh.h"
#include "sidebar.h"
* reads will be on block boundaries, which might increase efficiency. */
while ((pos -= bytes_read) >= 0) {
/* we save in the buffer at the end the first 7 chars from the last read */
- strncpy (buffer + BUFSIZ, buffer, 5 + 2); /* 2 == 2 * safe_strlen(CRLF) */
+ strncpy (buffer + BUFSIZ, buffer, 5 + 2); /* 2 == 2 * str_len(CRLF) */
fseek (f, pos, SEEK_SET);
bytes_read = fread (buffer, sizeof (char), bytes_read, f);
if (bytes_read == -1)
return -1;
for (i = bytes_read; --i >= 0;)
- if (!safe_strncmp (buffer + i, "\n\nFrom ", safe_strlen ("\n\nFrom "))) { /* found it - go to the beginning of the From */
+ if (!str_ncmp (buffer + i, "\n\nFrom ", str_len ("\n\nFrom "))) { /* found it - go to the beginning of the From */
fseek (f, pos + i + 2, SEEK_SET);
return 0;
}
}
/* here we are at the beginning of the file */
- if (!safe_strncmp ("From ", buffer, 5)) {
+ if (!str_ncmp ("From ", buffer, 5)) {
fseek (f, 0, 0);
return (0);
}
#endif
/* func to free buffy for list_del() */
-static void buffy_free (void** p) {
- FREE(&(*((BUFFY**) p))->path);
- FREE(p);
+static void buffy_free (BUFFY** p) {
+ mem_free(&(*p)->path);
+ mem_free(p);
}
int buffy_lookup (const char* path) {
if (list_empty(Incoming) || !path || !*path)
return (-1);
for (i = 0; i < Incoming->length; i++) {
- if (safe_strcmp (((BUFFY*) Incoming->data[i])->path, path) == 0)
+ if (str_eq (((BUFFY*) Incoming->data[i])->path, path) )
return (i);
}
return (-1);
mutt_extract_token (path, s, 0);
strfcpy (buf, path->data, sizeof (buf));
- if (data == M_UNMAILBOXES && safe_strcmp (buf, "*") == 0) {
- list_del (&Incoming, buffy_free);
+ if (data == M_UNMAILBOXES && str_eq (buf, "*") == 0) {
+ list_del (&Incoming, (list_del_t*) buffy_free);
return 0;
}
}
if (i < 0) {
- tmp = safe_calloc (1, sizeof (BUFFY));
- tmp->path = safe_strdup (buf);
+ tmp = mem_calloc (1, sizeof (BUFFY));
+ tmp->path = str_dup (buf);
tmp->magic = 0;
list_push_back (&Incoming, tmp);
i = Incoming->length-1;
/* check to see if the folder is the currently selected folder
* before polling */
if (!Context || !Context->path || (local ? (sb.st_dev != contex_sb.st_dev ||
- sb.st_ino != contex_sb.st_ino) :
- safe_strcmp (tmp->path, Context->path))) {
+ sb.st_ino != contex_sb.st_ino) :
+ !str_eq (tmp->path, Context->path))) {
switch (tmp->magic) {
case M_MBOX:
case M_MMDF:
pos = 0;
first = 1;
buffylist[0] = 0;
- pos += safe_strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+ pos += str_len (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
if (Incoming) {
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
strfcpy (path, tmp->path, sizeof (path));
mutt_pretty_mailbox (path);
- if (!first && pos + safe_strlen (path) >= COLS - 7)
+ if (!first && pos + str_len (path) >= COLS - 7)
break;
if (!first)
- pos += safe_strlen (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+ pos += str_len (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
/* Prepend an asterisk to mailboxes not already notified */
if (!tmp->notified) {
- /* pos += safe_strlen (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */
+ /* pos += str_len (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */
tmp->notified = 1;
BuffyNotify--;
}
- pos += safe_strlen (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+ pos += str_len (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
}
*/
void buffy_next (char *s, size_t slen)
{
- int i = 0, c = 0;
+ int i = 0, c = 0, l = 0;
if (list_empty(Incoming))
return;
return;
}
- i = buffy_lookup (s);
- c = i == Incoming->length-1 ? 0 : i+1;
- while (((BUFFY*) Incoming->data[c])->new <= 0) {
- c = (c+1) % Incoming->length;
- if (c == i)
- break; /* tried all once */
+ /*
+ * If buffy_lookup returns the index,
+ * or -1 if not found (-1..Incoming->length-1);
+ * plus one --> (0..Incoming->length).
+ * Modulo mapps it into the correct range.
+ */
+ i = 1 + buffy_lookup (s);
+ for (l=0; l < Incoming->length; l++) {
+ c = (l+i) % Incoming->length;
+ if ((!Context || !Context->path || !str_eq (((BUFFY*) Incoming->data[c])->path, Context->path)) &&
+ ((BUFFY*) Incoming->data[c])->new > 0)
+ break;
}
- if (c == i) {
+ if (l >= Incoming->length) {
*s = '\0';
/* something went wrong since we're here when buffy_check
* reported new mail */