Changeset 1640:89a63d6c0d6f for commands.c

Timestamp:

2000-03-16 02:01:43 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Add the $print_decode option.

Files:

• commands.c (modified) (4 diffs)

commands.c

@@ -233 +233 @@
 }
 
+static void pipe_print_set_flags (int decode, int *cmflags, int *chflags)
+{
+  if (decode)
+  {
+    *cmflags |= M_CM_DECODE | M_CM_CHARCONV;
+    *chflags |= CH_DECODE | CH_REORDER;
+    
+    if (option (OPTWEED))
+    {
+      *chflags |= CH_WEED;
+      *cmflags |= M_CM_WEED;
+    }
+  }
+}
+
 void mutt_pipe_message_to_state (HEADER *h, STATE *s)
 {
@@ -238 +253 @@
   int chflags = CH_FROM;
   
-  if (option (OPTPIPEDECODE))
-  {
-    cmflags |= M_CM_DECODE | M_CM_CHARCONV;
-    chflags |= CH_DECODE | CH_REORDER;
-    
-    if (option (OPTWEED))
-    {
-      chflags |= CH_WEED;
-      cmflags |= M_CM_WEED;
-    }
-  }
+  pipe_print_set_flags (option (OPTPIPEDECODE), &cmflags, &chflags);
   
   if (option (OPTPIPEDECODE))
@@ -687 +692 @@
 }
 
+/* XXX - merge this with mutt_pipe_message_to_state? */
+
 static void print_msg (FILE *fp, CONTEXT *ctx, HEADER *h)
 {
-  int cmflags = M_CM_DECODE | M_CM_CHARCONV;
-  int chflags = CH_DECODE | CH_REORDER;
-
-  if (option (OPTWEED))
-  {
-    cmflags |= M_CM_WEED;
-    chflags |= CH_WEED;
-  }
-
-#ifdef HAVE_PGP
-  if (h->pgp & PGPENCRYPT)
+  int cmflags = 0;
+  int chflags = CH_FROM;
+
+  pipe_print_set_flags (option (OPTPRINTDECODE), &cmflags, &chflags);
+
+#ifdef HAVE_PGP
+  if (option (OPTPRINTDECODE) && (h->pgp & PGPENCRYPT))
   {
     if (!pgp_valid_passphrase ())
@@ -707 +710 @@
 #endif
 
-  mutt_parse_mime_message (ctx, h);
+  if (option (OPTPRINTDECODE))
+    mutt_parse_mime_message (ctx, h);
+
   mutt_copy_message (fp, ctx, h, cmflags, chflags);
 }