projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reindent and optimizations in BUFFER* struct.
[apps/madmutt.git]
/
handler.c
diff --git
a/handler.c
b/handler.c
index
b3d65e5
..
553ff29
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-19,10
+19,11
@@
#include <sys/stat.h>
#include <lib-lib/mem.h>
#include <sys/stat.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "recvattach.h"
#include "handler.h"
#include "mutt_curses.h"
#include "recvattach.h"
#include "handler.h"
#include "mutt_curses.h"
@@
-37,7
+38,6
@@
#include "attach.h"
#include "lib.h"
#include "attach.h"
#include "lib.h"
-#include "lib/str.h"
#include "lib/debug.h"
typedef int handler_f (BODY *, STATE *);
#include "lib/debug.h"
typedef int handler_f (BODY *, STATE *);
@@
-199,7
+199,7
@@
void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
break;
if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
break;
- linelen =
str_len
(line);
+ linelen =
m_strlen
(line);
len -= linelen;
/*
len -= linelen;
/*
@@
-326,14
+326,14
@@
void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -=
str_len
(tmps);
+ len -=
m_strlen
(tmps);
if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
break;
}
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
break;
}
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -=
str_len
(tmps);
+ len -=
m_strlen
(tmps);
if (!str_ncmp (tmps, "end", 3))
break;
pt = tmps;
if (!str_ncmp (tmps, "end", 3))
break;
pt = tmps;
@@
-474,7
+474,7
@@
static void enriched_wrap (struct enriched_state *stte)
stte->indent_len = 0;
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
stte->indent_len = 0;
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
- stte->indent_len +=
str_len
(stte->s->prefix);
+ stte->indent_len +=
m_strlen
(stte->s->prefix);
}
if (stte->tag_level[RICH_EXCERPT]) {
}
if (stte->tag_level[RICH_EXCERPT]) {
@@
-482,11
+482,11
@@
static void enriched_wrap (struct enriched_state *stte)
while (x) {
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
while (x) {
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
- stte->indent_len +=
str_len
(stte->s->prefix);
+ stte->indent_len +=
m_strlen
(stte->s->prefix);
}
else {
state_puts ("> ", stte->s);
}
else {
state_puts ("> ", stte->s);
- stte->indent_len +=
str_len
("> ");
+ stte->indent_len +=
m_strlen
("> ");
}
x--;
}
}
x--;
}
@@
-588,7
+588,7
@@
static void enriched_puts (const char *s, struct enriched_state *stte)
{
const char *p;
{
const char *p;
- if (stte->buff_len < stte->buff_used +
str_len
(s)) {
+ if (stte->buff_len < stte->buff_used +
m_strlen
(s)) {
stte->buff_len += LONG_STRING;
p_realloc(&stte->buffer, stte->buff_len + 1);
}
stte->buff_len += LONG_STRING;
p_realloc(&stte->buffer, stte->buff_len + 1);
}
@@
-678,7
+678,7
@@
int text_enriched_handler (BODY * a, STATE * s)
int tag_len = 0;
char tag[LONG_STRING + 1];
int tag_len = 0;
char tag[LONG_STRING + 1];
-
memset (&stte, 0, sizeof (stte)
);
+
p_clear(&stte, 1
);
stte.s = s;
stte.WrapMargin =
((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
stte.s = s;
stte.WrapMargin =
((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
@@
-692,7
+692,7
@@
int text_enriched_handler (BODY * a, STATE * s)
if (s->prefix) {
state_puts (s->prefix, s);
if (s->prefix) {
state_puts (s->prefix, s);
- stte.indent_len +=
str_len
(s->prefix);
+ stte.indent_len +=
m_strlen
(s->prefix);
}
while (state != DONE) {
}
while (state != DONE) {
@@
-831,7
+831,7
@@
static int alternative_handler (BODY * a, STATE * s)
}
else {
wild = 1;
}
else {
wild = 1;
- btlen =
str_len
(t->data);
+ btlen =
m_strlen
(t->data);
}
if (a && a->parts)
}
if (a && a->parts)
@@
-1096,7
+1096,7
@@
static int autoview_handler (BODY * a, STATE * s)
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
- fname =
str_dup
(a->filename);
+ fname =
m_strdup
(a->filename);
mutt_sanitize_filename (fname, 1);
rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
sizeof (tempfile));
mutt_sanitize_filename (fname, 1);
rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
sizeof (tempfile));