projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
927be73
..
70b31ac
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-16,9
+16,9
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.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
+26,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>
@@
-100,7
+101,7
@@
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
{
if (*used == *slots) {
*slots += 5;
{
if (*used == *slots) {
*slots += 5;
-
safe
_realloc (type2_list, sizeof (REMAILER *) * (*slots));
+
mem
_realloc (type2_list, sizeof (REMAILER *) * (*slots));
}
(*type2_list)[(*used)++] = entry;
}
(*type2_list)[(*used)++] = entry;
@@
-110,16
+111,16
@@
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
static REMAILER *mix_new_remailer (void)
{
static REMAILER *mix_new_remailer (void)
{
- return
safe
_calloc (1, sizeof (REMAILER));
+ return
mem
_calloc (1, sizeof (REMAILER));
}
static void mix_free_remailer (REMAILER ** r)
{
}
static void mix_free_remailer (REMAILER ** r)
{
-
FREE
(&(*r)->shortname);
-
FREE
(&(*r)->addr);
-
FREE
(&(*r)->ver);
+
mem_free
(&(*r)->shortname);
+
mem_free
(&(*r)->addr);
+
mem_free
(&(*r)->ver);
-
FREE
(r);
+
mem_free
(r);
}
/* parse the type2.list as given by mixmaster -T */
}
/* parse the type2.list as given by mixmaster -T */
@@
-155,7
+156,7
@@
static REMAILER **mix_type2_list (size_t * l)
/* first, generate the "random" remailer */
p = mix_new_remailer ();
/* first, generate the "random" remailer */
p = mix_new_remailer ();
- p->shortname = s
afe_str
dup ("<random>");
+ p->shortname = s
tr_
dup ("<random>");
mix_add_entry (&type2_list, p, &slots, &used);
while (fgets (line, sizeof (line), fp)) {
mix_add_entry (&type2_list, p, &slots, &used);
while (fgets (line, sizeof (line), fp)) {
@@
-164,12
+165,12
@@
static REMAILER **mix_type2_list (size_t * l)
if (!(t = strtok (line, " \t\n")))
goto problem;
if (!(t = strtok (line, " \t\n")))
goto problem;
- p->shortname = s
afe_str
dup (t);
+ p->shortname = s
tr_
dup (t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
- p->addr = s
afe_str
dup (t);
+ p->addr = s
tr_
dup (t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
@@
-177,7
+178,7
@@
static REMAILER **mix_type2_list (size_t * l)
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
- p->ver = s
afe_str
dup (t);
+ p->ver = s
tr_
dup (t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
@@
-209,7
+210,7
@@
static void mix_free_type2_list (REMAILER *** ttlp)
for (i = 0; type2_list[i]; i++)
mix_free_remailer (&type2_list[i]);
for (i = 0; type2_list[i]; i++)
mix_free_remailer (&type2_list[i]);
-
FREE
(type2_list);
+
mem_free
(type2_list);
}
}
@@
-228,13
+229,13
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
if (!chain->cl)
return;
if (!chain->cl)
return;
-
safe
_realloc (coordsp, sizeof (struct coord) * chain->cl);
+
mem
_realloc (coordsp, sizeof (struct coord) * chain->cl);
coords = *coordsp;
if (i) {
c =
coords = *coordsp;
if (i) {
c =
- coords[i - 1].c +
mutt_str
len (type2_list[chain->ch[i - 1]]->shortname) + 2;
+ coords[i - 1].c +
str_
len (type2_list[chain->ch[i - 1]]->shortname) + 2;
r = coords[i - 1].r;
}
else {
r = coords[i - 1].r;
}
else {
@@
-245,7
+246,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_str
len (type2_list[chain->ch[i]]->shortname) + 2;
+ c +=
str_
len (type2_list[chain->ch[i]]->shortname) + 2;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
@@
-431,7
+432,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_str
cmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
+ if (!
str_
cmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
chain->ch[chain->cl++] = 0;
return 0;
}
chain->ch[chain->cl++] = 0;
return 0;
}
@@
-490,7
+491,7
@@
void mix_make_chain (LIST ** chainp, int *redraw)
*redraw = REDRAW_FULL;
*redraw = REDRAW_FULL;
- chain =
safe
_calloc (sizeof (MIXCHAIN), 1);
+ chain =
mem
_calloc (sizeof (MIXCHAIN), 1);
for (p = *chainp; p; p = p->next)
mix_chain_add (chain, (char *) p->data, type2_list);
for (p = *chainp; p; p = p->next)
mix_chain_add (chain, (char *) p->data, type2_list);
@@
-657,8
+658,8
@@
void mix_make_chain (LIST ** chainp, int *redraw)
}
mix_free_type2_list (&type2_list);
}
mix_free_type2_list (&type2_list);
-
FREE
(&coords);
-
FREE
(&chain);
+
mem_free
(&coords);
+
mem_free
(&chain);
}
/* some safety checks before piping the message to mixmaster */
}
/* some safety checks before piping the message to mixmaster */