s++;
}
- *d = '\0';
+ if (d)
+ *d = '\0';
return rv;
}
switch (op) {
case 'f':
- m_strcpy(dest, destlen, alias->del ? "D" : " ");
+ m_strputc(dest, destlen, alias->del ? 'D' : ' ');
break;
case 'a':
mutt_format_s(dest, destlen, fmt, alias->name);
snprintf(dest, destlen, tmp, alias->num + 1);
break;
case 't':
- m_strcpy(dest, destlen, alias->tagged ? "*" : " ");
+ m_strputc(dest, destlen, alias->tagged ? '*' : ' ');
break;
}
return src;
}
-static void alias_entry (char *s, ssize_t slen, MUTTMENU *m, int num)
+static void alias_entry(char *s, ssize_t slen, MUTTMENU *m, int num)
{
- m_strformat(s, slen, NONULL (AliasFmt), alias_format_str,
- ((alias_t **)m->data)[num],
- option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+ m_strformat(s, slen, COLS - SW, AliasFmt, alias_format_str,
+ ((alias_t **)m->data)[num],
+ option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
static int alias_tag (MUTTMENU * menu, int n, int m)