remove patchlist things, and more generated and commited things.

[apps/madmutt.git] / rfc3676.c

diff --git a/rfc3676.c b/rfc3676.c
index 650fc50..f6ca099 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -136,13 +136,15 @@ 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];
-  char *curline = str_dup ("");
+  char *curline = mem_malloc(1);
   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))) {
     delsp = str_len (t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
@@ -173,7 +175,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
      * 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;
     }