projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
927be73
..
3239993
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-18,7
+18,6
@@
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
-#include "mutt_regex.h"
#include "mapping.h"
#include "remailer.h"
#include "mapping.h"
#include "remailer.h"
@@
-26,6
+25,7
@@
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/rx.h"
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
@@
-234,7
+234,7
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
if (i) {
c =
if (i) {
c =
- coords[i - 1].c +
mutt
_strlen (type2_list[chain->ch[i - 1]]->shortname) + 2;
+ coords[i - 1].c +
safe
_strlen (type2_list[chain->ch[i - 1]]->shortname) + 2;
r = coords[i - 1].r;
}
else {
r = coords[i - 1].r;
}
else {
@@
-245,7
+245,7
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
for (; i < chain->cl; i++) {
oc = c;
for (; i < chain->cl; i++) {
oc = c;
- c +=
mutt
_strlen (type2_list[chain->ch[i]]->shortname) + 2;
+ c +=
safe
_strlen (type2_list[chain->ch[i]]->shortname) + 2;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
@@
-431,7
+431,7
@@
static int mix_chain_add (MIXCHAIN * chain, const char *s,
if (chain->cl >= MAXMIXES)
return -1;
if (chain->cl >= MAXMIXES)
return -1;
- if (!
mutt
_strcmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
+ if (!
safe
_strcmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
chain->ch[chain->cl++] = 0;
return 0;
}
chain->ch[chain->cl++] = 0;
return 0;
}