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]
/
handler.c
diff --git
a/handler.c
b/handler.c
index
9a90f6f
..
b5c3bda
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-28,6
+28,9
@@
#include "mutt_crypt.h"
#include "lib.h"
#include "mutt_crypt.h"
#include "lib.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
#define BUFI_SIZE 1000
#define BUFO_SIZE 2000
#define BUFI_SIZE 1000
#define BUFO_SIZE 2000
@@
-238,7
+241,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 = strlen (line);
+ linelen =
mutt_
strlen (line);
len -= linelen;
/*
len -= linelen;
/*
@@
-940,7
+943,7
@@
static void text_plain_flowed_handler (BODY * a, STATE * s)
fprintf (stderr, "flowed_max = %d\n", flowed_max);
while (bytes > 0 && fgets (line, sizeof (line), s->fpin)) {
fprintf (stderr, "flowed_max = %d\n", flowed_max);
while (bytes > 0 && fgets (line, sizeof (line), s->fpin)) {
- bytes -= strlen (line);
+ bytes -=
mutt_
strlen (line);
tail = NULL;
last_full = full;
tail = NULL;
last_full = full;
@@
-970,7
+973,7
@@
static void text_plain_flowed_handler (BODY * a, STATE * s)
*/
full = 0;
*/
full = 0;
- l = strlen (t + 1);
+ l =
mutt_
strlen (t + 1);
t[0] = ' ';
t[1] = '\0';
t[0] = ' ';
t[1] = '\0';
@@
-1123,7
+1126,7
@@
static void print_flowed_line (char *line, STATE * s, int ql)
{
int width;
char *pos, *oldpos;
{
int width;
char *pos, *oldpos;
- int len = strlen (line);
+ int len =
mutt_
strlen (line);
int i;
if (MaxLineLength > 0) {
int i;
if (MaxLineLength > 0) {
@@
-1147,7
+1150,7
@@
static void print_flowed_line (char *line, STATE * s, int ql)
/* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
/* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
- if (strlen (line) == 0) {
+ if (
mutt_
strlen (line) == 0) {
if (option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
if (option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
@@
-1230,24
+1233,24
@@
static void text_plain_flowed_handler (BODY * a, STATE * s)
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
/* fprintf(stderr,"read `%s'",buf); */
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
/* fprintf(stderr,"read `%s'",buf); */
- bytes -= strlen (buf);
+ bytes -=
mutt_
strlen (buf);
newql = get_quote_level (buf);
if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
*t = '\0';
newql = get_quote_level (buf);
if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
*t = '\0';
- if (
strlen (curline) > 0 && curline[
strlen (curline) - 1] == ' '
+ if (
mutt_strlen (curline) > 0 && curline[mutt_
strlen (curline) - 1] == ' '
&& newql == quotelevel
&& strcmp (curline + quotelevel, "-- ") != 0) {
if (buf[newql] == ' ')
&& newql == quotelevel
&& strcmp (curline + quotelevel, "-- ") != 0) {
if (buf[newql] == ' ')
- curline[strlen (curline) - 1] = '\0';
+ curline[
mutt_
strlen (curline) - 1] = '\0';
- curline = realloc (curline, curline_len + strlen (buf));
+ curline = realloc (curline, curline_len +
mutt_
strlen (buf));
if (curline_len == 1)
*curline = '\0';
if (curline_len == 1)
*curline = '\0';
- curline_len += strlen (buf);
+ curline_len +=
mutt_
strlen (buf);
safe_strncat (curline, curline_len, buf + newql,
safe_strncat (curline, curline_len, buf + newql,
- strlen (buf + newql));
+
mutt_
strlen (buf + newql));
}
else {
if (first_line) {
}
else {
if (first_line) {
@@
-1258,11
+1261,11
@@
static void text_plain_flowed_handler (BODY * a, STATE * s)
}
FREE (&curline);
curline_len = 1;
}
FREE (&curline);
curline_len = 1;
- curline = realloc (curline, curline_len + strlen (buf));
+ curline = realloc (curline, curline_len +
mutt_
strlen (buf));
if (curline_len == 1)
*curline = '\0';
if (curline_len == 1)
*curline = '\0';
- curline_len += strlen (buf);
- safe_strncat (curline, curline_len, buf, strlen (buf));
+ curline_len +=
mutt_
strlen (buf);
+ safe_strncat (curline, curline_len, buf,
mutt_
strlen (buf));
quotelevel = newql;
}
}
quotelevel = newql;
}
}