Rocco Rutte:

[apps/madmutt.git] / rfc3676.c

diff --git a/rfc3676.c b/rfc3676.c
index 9efa39d..69f7fba 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -52,7 +52,7 @@ static void print_flowed_line (char *line, STATE * s,
 
   if (MaxLineLength > 0) {
     width = MaxLineLength - WrapMargin - ql - 1;
-    if (option (OPTSTUFFQUOTED))
+    if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED))
       --width;
     if (width < 0)
       width = MaxLineLength;
@@ -63,7 +63,7 @@ static void print_flowed_line (char *line, STATE * s,
     else
       width = COLS - WrapMargin - ql - 1;
 
-    if (option (OPTSTUFFQUOTED))
+    if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED))
       --width;
     if (width < 0)
       width = COLS;
@@ -74,7 +74,7 @@ static void print_flowed_line (char *line, STATE * s,
       if (s->prefix)
         state_puts(s->prefix,s);
       for (i=0;i<ql;++i) state_putc('>',s);
-      if (option(OPTSTUFFQUOTED))
+      if (!(s->flags & M_REPLYING) && option(OPTSTUFFQUOTED))
         state_putc(' ',s);
     }
     state_putc('\n',s);
@@ -123,7 +123,8 @@ static void print_flowed_line (char *line, STATE * s,
 
     for (i = 0; i < ql; ++i)
       state_putc ('>', s);
-    if (option (OPTSTUFFQUOTED) && (ql > 0 || s->prefix))
+    if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED) &&
+        (ql > 0 || s->prefix))
       state_putc (' ', s);
 
     if (delsp && spaces && space_len > 0) {
@@ -240,38 +241,48 @@ int rfc3676_handler (BODY * a, STATE * s) {
   return (0);
 }
 
-void rfc3676_quote_line (STATE* s, char* dst, size_t dstlen,
-                         const char* line) {
-  char quote[SHORT_STRING];
-  int offset = 0, i = 0, count = 0;
-  regmatch_t pmatch[1];
+void rfc3676_space_stuff (HEADER* hdr) {
+#if DEBUG
+  int lc = 0;
+  size_t len = 0;
+  unsigned char c = '\0';
+#endif
+  FILE* in = NULL, *out = NULL;
+  char buf[LONG_STRING];
+  char tmpfile[_POSIX_PATH_MAX];
 
-  quote[0] = '\0';
+  if (!hdr || !hdr->content || !hdr->content->filename)
+    return;
 
-  while (regexec ((regex_t *) QuoteRegexp.rx, &line[offset],
-                  1, pmatch, 0) == 0)
-    offset += pmatch->rm_eo;
+  debug_print (2, ("f=f: postprocess %s\n", hdr->content->filename));
+  if ((in = safe_fopen (hdr->content->filename, "r")) == NULL)
+    return;
+  mutt_mktemp (tmpfile);
+  if ((out = safe_fopen (tmpfile, "w+")) == NULL) {
+    fclose (in);
+    return;
+  }
 
-  if (offset > 0) {
-    /* first count number of real quoting characters;
-     * read: non-spaces
-     * this maybe just plain wrong, but leaving spaces
-     * within quoting characters is what I consider
-     * more plain wrong...
-     */
-    for (i = 0; i < offset; i++)
-      if (line[i] != ' ')
-        count++;
-    /* just make sure we're inside quote althoug we
-     * likely won't have more than SHORT_STRING quote levels... */
-    i = (count > SHORT_STRING-1) ? SHORT_STRING-1 : count;
-    memset (quote, '>', i);
-    quote[i] = '\0';
+  while (fgets (buf, sizeof (buf), in)) {
+    if (ascii_strncmp ("From ", buf, 4) == 0 || buf[0] == ' ') {
+      fputc (' ', out);
+#if DEBUG
+      lc++;
+      len = str_len (buf);
+      if (len > 0) {
+        c = buf[len-1];
+        buf[len-1] = '\0';
+      }
+      debug_print (4, ("f=f: line %d needs space-stuffing: '%s'\n",
+                       lc, buf));
+      if (len > 0)
+        buf[len-1] = c;
+#endif
+    }
+    fputs (buf, out);
   }
-  debug_print (4, ("f=f: quotelevel = %d, new prefix = '%s'\n",
-                   i, NONULL (quote)));
-  /* if we changed prefix, make sure we respect $stuff_quoted */
-  snprintf (dst, dstlen, "%s%s%s%s", NONULL (s->prefix), NONULL (quote),
-            option (OPTSTUFFQUOTED) && line[offset] != ' ' ? " " : "",
-            &line[offset]);
+  fclose (in);
+  unlink (hdr->content->filename);
+  fclose (out);
+  str_replace (&hdr->content->filename, tmpfile);
 }