projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, we don't need that. fix a regression in <esc>e
[apps/madmutt.git]
/
rfc3676.c
diff --git
a/rfc3676.c
b/rfc3676.c
index
bd4bd03
..
c194540
100644
(file)
--- a/
rfc3676.c
+++ b/
rfc3676.c
@@
-21,16
+21,17
@@
#include <sys/stat.h>
#include <lib-lib/mem.h>
#include <sys/stat.h>
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt.h"
#include "mutt_curses.h"
-#include "ascii.h"
#include "handler.h"
#include "state.h"
#include "lib.h"
#include "handler.h"
#include "state.h"
#include "lib.h"
-#include "lib/str.h"
#include "lib/debug.h"
#define FLOWED_MAX 77
#include "lib/debug.h"
#define FLOWED_MAX 77
@@
-46,7
+47,7
@@
static int get_quote_level (char *line)
static void print_flowed_line (char *line, STATE * s, int ql) {
int width;
char *pos, *oldpos;
static void print_flowed_line (char *line, STATE * s, int ql) {
int width;
char *pos, *oldpos;
- int len =
str_len
(line);
+ int len =
m_strlen
(line);
int i;
if (MaxLineLength > 0) {
int i;
if (MaxLineLength > 0) {
@@
-68,7
+69,7
@@
static void print_flowed_line (char *line, STATE * s, int ql) {
width = COLS;
}
width = COLS;
}
- if (
str_len
(line) == 0) {
+ if (
m_strlen
(line) == 0) {
if (!(s->flags & M_REPLYING) || option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
if (!(s->flags & M_REPLYING) || option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
@@
-148,7
+149,7
@@
int rfc3676_handler (BODY * a, STATE * s) {
/* respect DelSP of RfC3676 only with f=f parts */
if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
/* respect DelSP of RfC3676 only with f=f parts */
if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
- delsp =
str_len
(t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
+ delsp =
m_strlen
(t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
t = NULL;
}
t = NULL;
}
@@
-156,7
+157,7
@@
int rfc3676_handler (BODY * a, STATE * s) {
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
- buf_len =
str_len
(buf);
+ buf_len =
m_strlen
(buf);
bytes -= buf_len;
newql = get_quote_level (buf);
bytes -= buf_len;
newql = get_quote_level (buf);
@@
-254,7
+255,7
@@
void rfc3676_space_stuff (HEADER* hdr) {
fputc (' ', out);
#if DEBUG
lc++;
fputc (' ', out);
#if DEBUG
lc++;
- len =
str_len
(buf);
+ len =
m_strlen
(buf);
if (len > 0) {
c = buf[len-1];
buf[len-1] = '\0';
if (len > 0) {
c = buf[len-1];
buf[len-1] = '\0';
@@
-271,5
+272,5
@@
void rfc3676_space_stuff (HEADER* hdr) {
fclose (out);
mutt_set_mtime (hdr->content->filename, tmpfile);
unlink (hdr->content->filename);
fclose (out);
mutt_set_mtime (hdr->content->filename, tmpfile);
unlink (hdr->content->filename);
-
str_replace
(&hdr->content->filename, tmpfile);
+
m_strreplace
(&hdr->content->filename, tmpfile);
}
}