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) {
+ if (data == M_UNMAILBOXES && str_eq (buf, "*") == 0) {
list_del (&Incoming, buffy_free);
return 0;
}
/* 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:
*/
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 */