projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missing file
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
6181c73
..
428e1ba
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-16,6
+16,9
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "recvattach.h"
#include "mutt.h"
#include "recvattach.h"
@@
-25,9
+28,6
@@
#include "remailer.h"
#include "remailer.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include <stdio.h>
#include "lib/rx.h"
#include <stdio.h>
@@
-105,7
+105,7
@@
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
{
if (*used == *slots) {
*slots += 5;
{
if (*used == *slots) {
*slots += 5;
-
mem_realloc (type2_list, sizeof (REMAILER *) * (*slots)
);
+
p_realloc(type2_list, *slots
);
}
(*type2_list)[(*used)++] = entry;
}
(*type2_list)[(*used)++] = entry;
@@
-160,7
+160,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 =
str_dup
("<random>");
+ p->shortname =
m_strdup
("<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)) {
@@
-169,12
+169,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 =
str_dup
(t);
+ p->shortname =
m_strdup
(t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
- p->addr =
str_dup
(t);
+ p->addr =
m_strdup
(t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
@@
-182,7
+182,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 =
str_dup
(t);
+ p->ver =
m_strdup
(t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
@@
-233,13
+233,13
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
if (!chain->cl)
return;
if (!chain->cl)
return;
-
mem_realloc (coordsp, sizeof (struct coord) *
chain->cl);
+
p_realloc(coordsp,
chain->cl);
coords = *coordsp;
if (i) {
c =
coords = *coordsp;
if (i) {
c =
- coords[i - 1].c +
str_len
(type2_list[chain->ch[i - 1]]->shortname) + 2;
+ coords[i - 1].c +
m_strlen
(type2_list[chain->ch[i - 1]]->shortname) + 2;
r = coords[i - 1].r;
}
else {
r = coords[i - 1].r;
}
else {
@@
-250,7
+250,7
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
for (; i < chain->cl; i++) {
oc = c;
for (; i < chain->cl; i++) {
oc = c;
- c +=
str_len
(type2_list[chain->ch[i]]->shortname) + 2;
+ c +=
m_strlen
(type2_list[chain->ch[i]]->shortname) + 2;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
@@
-437,7
+437,7
@@
static int mix_chain_add (MIXCHAIN * chain, const char *s,
if (chain->cl >= MAXMIXES)
return -1;
if (chain->cl >= MAXMIXES)
return -1;
- if (!
str_cmp
(s, "0") || !ascii_strcasecmp (s, "<random>")) {
+ if (!
m_strcmp
(s, "0") || !ascii_strcasecmp (s, "<random>")) {
chain->ch[chain->cl++] = 0;
return 0;
}
chain->ch[chain->cl++] = 0;
return 0;
}