projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use safer p_clear when possible.
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
8b1a302
..
cbefd24
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-16,6
+16,7
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include <lib-lib/macros.h>
#include "mutt.h"
@@
-26,7
+27,6
@@
#include "remailer.h"
#include "remailer.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include <stdio.h>
#include "lib/rx.h"
#include <stdio.h>
@@
-159,7
+159,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)) {
@@
-168,12
+168,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;
@@
-181,7
+181,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;
@@
-238,7
+238,7
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
if (i) {
c =
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 {
@@
-249,7
+249,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;