move gpg_check_traditionnal in crypt.cpkg

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/commands.c b/commands.c
index 8be7f8f..cde830d 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -234,29 +234,23 @@ void ci_bounce_message (HEADER * h, int *redraw)
     mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
 }
 
     mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
 }
 

-static void pipe_set_flags (int decode, int print, int *cmflags, int *chflags)
+static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)

 {
 {

+  int cmflags = 0;
+  int chflags = CH_FROM;
+

   if (decode) {
   if (decode) {

-    *cmflags |= M_CM_DECODE | M_CM_CHARCONV;
-    *chflags |= CH_DECODE | CH_REORDER;
+    cmflags |= M_CM_DECODE | M_CM_CHARCONV;
+    chflags |= CH_DECODE | CH_REORDER;

 
 

-    if (option (OPTWEED)) {
-      *chflags |= CH_WEED;
-      *cmflags |= M_CM_WEED;
+    if (option(OPTWEED)) {
+      chflags |= CH_WEED;
+      cmflags |= M_CM_WEED;

     }
   }
 
   if (print)
     }
   }
 
   if (print)

-    *cmflags |= M_CM_PRINTING;
-
-}
-
-static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
-{
-  int cmflags = 0;
-  int chflags = CH_FROM;
-
-  pipe_set_flags (decode, print, &cmflags, &chflags);
+    cmflags |= M_CM_PRINTING;

 
   if (decode && h->security & ENCRYPT) {
     endwin ();
 
   if (decode && h->security & ENCRYPT) {
     endwin ();


@@ -268,9 +262,7 @@ static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
   mutt_copy_message (fp, Context, h, cmflags, chflags);
 }
 
   mutt_copy_message (fp, Context, h, cmflags, chflags);
 }
 

-

 /* the following code is shared between printing and piping */
 /* the following code is shared between printing and piping */

-

 static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
                               int split, const char *sep)
 {
 static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
                               int split, const char *sep)
 {


@@ -817,42 +809,3 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 }
 
 
 }
 
 

-static int _mutt_check_traditional_pgp (HEADER * h, int *redraw)
-{
-  MESSAGE *msg;
-  int rv = 0;
-
-  h->security |= PGP_TRADITIONAL_CHECKED;
-
-  mutt_parse_mime_message (Context, h);
-  if ((msg = mx_open_message (Context, h->msgno)) == NULL)
-    return 0;
-  if (crypt_pgp_check_traditional (msg->fp, h->content, 0)) {
-    h->security = crypt_query (h->content);
-    *redraw |= REDRAW_FULL;
-    rv = 1;
-  }
-
-  h->security |= PGP_TRADITIONAL_CHECKED;
-  mx_close_message (&msg);
-  return rv;
-}
-
-int mutt_check_traditional_pgp (HEADER * h, int *redraw)
-{
-  int i;
-  int rv = 0;
-
-  if (h && !(h->security & PGP_TRADITIONAL_CHECKED))
-    rv = _mutt_check_traditional_pgp (h, redraw);
-  else {
-    for (i = 0; i < Context->vcount; i++)
-      if (Context->hdrs[Context->v2r[i]]->tagged &&
-          !(Context->hdrs[Context->v2r[i]]->
-            security & PGP_TRADITIONAL_CHECKED))
-        rv =
-          _mutt_check_traditional_pgp (Context->hdrs[Context->v2r[i]], redraw)
-          || rv;
-  }
-  return rv;
-}

diff --git a/crypt.cpkg b/crypt.cpkg
index b140ddf..1387f54 100644 (file)
--- a/crypt.cpkg
+++ b/crypt.cpkg
@@ -4042,4 +4042,44 @@ int mutt_signed_handler(BODY *a, STATE *s)
   return (rc);
 }
 
   return (rc);
 }
 

+static int _mutt_check_traditional_pgp (HEADER * h, int *redraw)
+{
+  MESSAGE *msg;
+  int rv = 0;
+
+  h->security |= PGP_TRADITIONAL_CHECKED;
+
+  mutt_parse_mime_message (Context, h);
+  if ((msg = mx_open_message (Context, h->msgno)) == NULL)
+    return 0;
+  if (crypt_pgp_check_traditional (msg->fp, h->content, 0)) {
+    h->security = crypt_query (h->content);
+    *redraw |= REDRAW_FULL;
+    rv = 1;
+  }
+
+  h->security |= PGP_TRADITIONAL_CHECKED;
+  mx_close_message (&msg);
+  return rv;
+}
+
+int mutt_check_traditional_pgp (HEADER * h, int *redraw)
+{
+  int i;
+  int rv = 0;
+
+  if (h && !(h->security & PGP_TRADITIONAL_CHECKED))
+    rv = _mutt_check_traditional_pgp (h, redraw);
+  else {
+    for (i = 0; i < Context->vcount; i++)
+      if (Context->hdrs[Context->v2r[i]]->tagged &&
+          !(Context->hdrs[Context->v2r[i]]->
+            security & PGP_TRADITIONAL_CHECKED))
+        rv =
+          _mutt_check_traditional_pgp (Context->hdrs[Context->v2r[i]], redraw)
+          || rv;
+  }
+  return rv;
+}
+

 /* vim:set ft=c: */
 /* vim:set ft=c: */

diff --git a/crypt.h b/crypt.h
index 8c5e274..5f78c9f 100644 (file)
--- a/crypt.h
+++ b/crypt.h
@@ -64,6 +64,7 @@ int crypt_send_menu(HEADER *msg, int *redraw, int smime);
 int mutt_protect (HEADER *, char *);
 int mutt_signed_handler (BODY *, STATE *);
 int mutt_parse_crypt_hdr (char *, int);
 int mutt_protect (HEADER *, char *);
 int mutt_signed_handler (BODY *, STATE *);
 int mutt_parse_crypt_hdr (char *, int);

+int mutt_check_traditional_pgp (HEADER *, int *);

 
 /* Check out the type of encryption used and set the cached status
    values if there are any. */
 
 /* Check out the type of encryption used and set the cached status
    values if there are any. */

diff --git a/protos.h b/protos.h
index e2915aa..d77a9f3 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -100,7 +100,6 @@ int mutt_change_flag (HEADER *, int);
 int mutt_check_month (const char *);
 int mutt_check_overwrite (const char *, const char *, char *, ssize_t, int *,
                           char **);
 int mutt_check_month (const char *);
 int mutt_check_overwrite (const char *, const char *, char *, ssize_t, int *,
                           char **);

-int mutt_check_traditional_pgp (HEADER *, int *);

 int mutt_command_complete (char *, ssize_t, int, int);
 int mutt_var_value_complete (char *, ssize_t, int);
 
 int mutt_command_complete (char *, ssize_t, int, int);
 int mutt_var_value_complete (char *, ssize_t, int);