projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wibble
[apps/madmutt.git]
/
rfc3676.c
diff --git
a/rfc3676.c
b/rfc3676.c
index
650fc50
..
c194540
100644
(file)
--- a/
rfc3676.c
+++ b/
rfc3676.c
@@
-20,16
+20,18
@@
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/wait.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/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/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#define FLOWED_MAX 77
#include "lib/debug.h"
#define FLOWED_MAX 77
@@
-45,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) {
@@
-67,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);
@@
-136,16
+138,18
@@
static void print_flowed_line (char *line, STATE * s, int ql) {
int rfc3676_handler (BODY * a, STATE * s) {
int bytes = a->length;
char buf[LONG_STRING];
int rfc3676_handler (BODY * a, STATE * s) {
int bytes = a->length;
char buf[LONG_STRING];
- char *curline =
str_dup (""
);
+ char *curline =
p_new(char, 1
);
char *t = NULL;
unsigned int curline_len = 1,
quotelevel = 0, newql = 0;
int buf_off, buf_len;
int delsp = 0, fixed = 0;
char *t = NULL;
unsigned int curline_len = 1,
quotelevel = 0, newql = 0;
int buf_off, buf_len;
int delsp = 0, fixed = 0;
+ *curline='\0';
+
/* 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;
}
@@
-153,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);
@@
-173,7
+177,7
@@
int rfc3676_handler (BODY * a, STATE * s) {
* possibly a change in quoting level. But that's better than not
* displaying it at all.
*/
* possibly a change in quoting level. But that's better than not
* displaying it at all.
*/
- if ((t = strrchr (buf, '\
n')) || (t = strrchr (buf, '\r
'))) {
+ if ((t = strrchr (buf, '\
r')) || (t = strrchr (buf, '\n
'))) {
*t = '\0';
buf_len = t - buf;
}
*t = '\0';
buf_len = t - buf;
}
@@
-208,7
+212,7
@@
int rfc3676_handler (BODY * a, STATE * s) {
curline_len = 1;
}
curline_len = 1;
}
-
mem_realloc
(&curline, curline_len + buf_len - buf_off);
+
p_realloc
(&curline, curline_len + buf_len - buf_off);
strcpy (curline + curline_len - 1, buf + buf_off);
curline_len += buf_len - buf_off;
strcpy (curline + curline_len - 1, buf + buf_off);
curline_len += buf_len - buf_off;
@@
-220,7
+224,7
@@
int rfc3676_handler (BODY * a, STATE * s) {
}
}
}
}
-
mem_free
(&curline);
+
p_delete
(&curline);
return (0);
}
return (0);
}
@@
-251,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';
@@
-268,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);
}
}